diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc index bb96fb7ff7f22..19c7bb0845050 100644 --- a/chrome/test/ppapi/ppapi_test.cc +++ b/chrome/test/ppapi/ppapi_test.cc @@ -49,10 +49,6 @@ #include "third_party/blink/public/common/input/web_input_event.h" #include "ui/gl/gl_switches.h" -#if defined(OS_WIN) -#include "base/win/windows_version.h" -#endif - using content::RenderViewHost; using content::TestMessageHandler; @@ -319,12 +315,10 @@ void OutOfProcessPPAPITest::SetUpCommandLine(base::CommandLine* command_line) { } void OutOfProcessPPAPITest::RunTest(const std::string& test_case) { - // TODO(crbug.com/1231528): Investigate why this test fails on Win 7 bots. #if defined(OS_WIN) - if (test_case == "Printing" && - base::win::GetVersion() <= base::win::Version::WIN7) { + // See crbug.com/1231528 for context. + if (test_case == "Printing") return; - } #endif PPAPITestBase::RunTest(test_case); diff --git a/printing/printing_context_win_unittest.cc b/printing/printing_context_win_unittest.cc index 59058cfdc5128..62ada59445e3f 100644 --- a/printing/printing_context_win_unittest.cc +++ b/printing/printing_context_win_unittest.cc @@ -14,7 +14,6 @@ #include "base/test/task_environment.h" #include "base/win/scoped_handle.h" #include "base/win/scoped_hdc.h" -#include "base/win/windows_version.h" #include "printing/backend/printing_info_win.h" #include "printing/backend/win_helper.h" #include "printing/mojom/print.mojom.h" @@ -146,11 +145,8 @@ class MockPrintingContextWin : public PrintingContextSystemDialogWin { } }; -TEST_F(PrintingContextTest, PrintAll) { - // TODO(crbug.com/1231528): Investigate why this test fails on Win 7 bots. - if (base::win::GetVersion() <= base::win::Version::WIN7) - return; - +// Disabled - see crbug.com/1231528 for context. +TEST_F(PrintingContextTest, DISABLED_PrintAll) { if (IsTestCaseDisabled()) return; @@ -165,11 +161,8 @@ TEST_F(PrintingContextTest, PrintAll) { EXPECT_EQ(0u, settings.ranges().size()); } -TEST_F(PrintingContextTest, Color) { - // TODO(crbug.com/1231528): Investigate why this test fails on Win 7 bots. - if (base::win::GetVersion() <= base::win::Version::WIN7) - return; - +// Disabled - see crbug.com/1231528 for context. +TEST_F(PrintingContextTest, DISABLED_Color) { if (IsTestCaseDisabled()) return; @@ -184,11 +177,8 @@ TEST_F(PrintingContextTest, Color) { EXPECT_NE(settings.color(), mojom::ColorModel::kUnknownColorModel); } -TEST_F(PrintingContextTest, Base) { - // TODO(crbug.com/1231528): Investigate why this test fails on Win 7 bots. - if (base::win::GetVersion() <= base::win::Version::WIN7) - return; - +// Disabled - see crbug.com/1231528 for context. +TEST_F(PrintingContextTest, DISABLED_Base) { if (IsTestCaseDisabled()) return;