Index: chrome/test/gpu/gpu_feature_browsertest.cc |
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc |
index 6cc7f9cdb0bc6c6c5f44758955c427f61b5f8228..6836ea360abe3f39883219889ccca08b646144f1 100644 |
--- a/chrome/test/gpu/gpu_feature_browsertest.cc |
+++ b/chrome/test/gpu/gpu_feature_browsertest.cc |
@@ -228,28 +228,6 @@ IN_PROC_BROWSER_TEST_F(AcceleratedCompositingBlockedTest, |
RunEventTest(url, kSwapBuffersEvent, false); |
} |
-class AcceleratedCompositingTest : public GpuFeatureTest { |
- public: |
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
- GpuFeatureTest::SetUpCommandLine(command_line); |
- command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); |
- } |
-}; |
- |
-#if defined(USE_AURA) || defined(OS_MACOSX) |
-// Compositing is always on for Aura and Mac. |
-#define MAYBE_AcceleratedCompositingDisabled DISABLED_AcceleratedCompositingDisabled |
-#else |
-#define MAYBE_AcceleratedCompositingDisabled AcceleratedCompositingDisabled |
-#endif |
- |
-IN_PROC_BROWSER_TEST_F(AcceleratedCompositingTest, |
- MAYBE_AcceleratedCompositingDisabled) { |
-// Compositing is always on for Windows Aura. |
- const base::FilePath url(FILE_PATH_LITERAL("feature_compositing.html")); |
- RunEventTest(url, kSwapBuffersEvent, false); |
-} |
- |
// Times out: http://crbug.com/166060 |
IN_PROC_BROWSER_TEST_F(GpuFeatureTest, DISABLED_WebGLAllowed) { |
EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted( |