Do not explicitly use --force-compositing-mode in memory/throughput tests; use the default config f…

chrome/test/perf/rendering/throughput_tests.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/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ skipping 175 matching lines @@
       if (!command_line->HasSwitch(switches::kRecordMode))
         command_line->AppendSwitch(switches::kPlaybackMode);
       command_line->AppendSwitchNative(switches::kDiskCacheDir,
                                        local_cache_path_.value());
       LOG(INFO) << local_cache_path_.value();
     }
     // We are measuring throughput, so we don't want any FPS throttling.
     command_line->AppendSwitch(switches::kDisableGpuVsync);
     command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
     // Enable or disable GPU acceleration.
-    if (use_gpu_) {
-      command_line->AppendSwitch(switches::kForceCompositingMode);
-    } else {
+    if (!use_gpu_) {
       command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
       command_line->AppendSwitch(switches::kDisableExperimentalWebGL);
       command_line->AppendSwitch(switches::kDisableAccelerated2dCanvas);
     }
     if (use_compositor_thread_) {
       ASSERT_TRUE(use_gpu_);
       command_line->AppendSwitch(switches::kEnableThreadedCompositing);
     } else {
       command_line->AppendSwitch(switches::kDisableThreadedCompositing);
     }
@@ skipping 393 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestGPU, CanvasManyImagesGPU) {
   RunCanvasBenchTest("many_images", kNone | kIsGpuCanvasTest);
 }
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestThread, CanvasManyImagesGPU) {
   RunCanvasBenchTest("many_images", kNone | kIsGpuCanvasTest);
 }
 
 }  // namespace