Remove --disable-accelerated-compositing

chrome/test/gpu/gpu_feature_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/trace_event_analyzer.h"
@@ skipping 210 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(AcceleratedCompositingBlockedTest,
                        MAYBE_AcceleratedCompositingBlocked) {
   EXPECT_TRUE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
       gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING));
 
   const base::FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
   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(
       gpu::GPU_FEATURE_TYPE_WEBGL));
 
   const base::FilePath url(FILE_PATH_LITERAL("feature_webgl.html"));
   RunEventTest(url, kWebGLCreationEvent, true);
 }
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) {
@@ skipping 295 matching lines @@
               "%d (resize offset %d): IOSurface width %d -> %d; Creates %d "
               "Expected %d", offset_i, offsets[offset_i],
               old_width, new_width, num_creates, expected_creates);
     }
   }
   LOG(INFO) << "finished test";
 }
 #endif
 
 }  // namespace