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

content/browser/gpu/gpu_memory_test.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/callback.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 58 matching lines @@
   }
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     base::FilePath test_dir;
     ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &test_dir));
     gpu_test_dir_ = test_dir.AppendASCII("gpu");
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(switches::kEnableLogging);
-    command_line->AppendSwitch(switches::kForceCompositingMode);
     command_line->AppendSwitchASCII(switches::kForceGpuMemAvailableMb,
                                     kMemoryLimitMBSwitch);
     // Only run this on GPU bots for now. These tests should work with
     // any GPU process, but may be slow.
     if (command_line->HasSwitch(switches::kUseGpuInTests)) {
       allow_tests_to_run_ = true;
     }
     // Don't enable these tests on Android just yet (they use lots of memory and
     // may not be stable).
 #if defined(OS_ANDROID)
@@ skipping 142 matching lines @@
   Shell* tab = CreateNewTab();
   LoadPage(tab, PAGE_CSS3D, kMemoryLimitMB);
   // Make sure that the CSS3D page maxes out a single tab's budget (otherwise
   // the test doesn't test anything) but still stays under the limit.
   EXPECT_TRUE(MemoryUsageInRange(
      kSingleTabLimitMB - kWiggleRoomMB,
      kMemoryLimitMB + kWiggleRoomMB));
 }
 
 }  // namespace content