Revert 224810 "Enable GPU control lists in tests."

AcceleratedCompositingBlockedTest.AcceleratedCompositingBlocked fails repeatedly
on Mac ASAN: http://build.chromium.org/p/chromium.memory/builders/Mac%20ASAN%20Tests%20%281%29/builds/14941/steps/browser_tests/logs/stdio
Also, it may be related to the OutOfProcessPPAPITest.Graphics3D failure: http://build.chromium.org/p/chromium.win/builders/Vista%20Tests%20%281%29/builds/40687/steps/browser_tests/logs/stdio

> Enable GPU control lists in tests.
> 
> Reland of https://codereview.chromium.org/23534006/ (see that and the bug for more details).
> 
> Also adding INFO-level logging to spell out each control list rule being applied on the bots (makes debugging and understanding failures much easier).
> 
> R=piman@chromium.org
> TBR=jcivelli, piman, zmo
> BUG=295799
> 
> Review URL: https://codereview.chromium.org/23703017

TBR=gab@chromium.org

Review URL: https://codereview.chromium.org/24165007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224845 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 30 insertions, 13 deletions

diff --git a/chrome/browser/gpu/chrome_gpu_util.cc b/chrome/browser/gpu/chrome_gpu_util.cc
index 5904713..61da773 100644
--- a/chrome/browser/gpu/chrome_gpu_util.cc
+++ b/chrome/browser/gpu/chrome_gpu_util.cc
@@ -46,6 +46,26 @@ bool ShouldRunCompositingFieldTrial() {
   return false;
 #endif
 
+#if defined(OS_WIN)
+  // Don't run the trial on Windows XP.
+  if (base::win::GetVersion() < base::win::VERSION_VISTA)
+    return false;
+#endif
+
+#if defined(OS_MACOSX)
+  // Browser and content shell tests hang on 10.7 when the Apple software
+  // renderer is used. These tests ignore the blacklist (which disables
+  // compositing both on 10.7 and when the Apple software renderer is used)
+  // by specifying the kSkipGpuDataLoading switch, so disable forced
+  // compositing here based on the switch and OS version.
+  // http://crbug.com/230931
+  if (base::mac::IsOSLion() &&
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kSkipGpuDataLoading)) {
+    return false;
+  }
+#endif
+
   // Don't activate the field trial if force-compositing-mode has been
   // explicitly disabled from the command line.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
diff --git a/chrome/test/base/test_launcher_utils.cc b/chrome/test/base/test_launcher_utils.cc
index f5bf93c..1f81ef9 100644
--- a/chrome/test/base/test_launcher_utils.cc
+++ b/chrome/test/base/test_launcher_utils.cc
@@ -47,6 +47,10 @@ void PrepareBrowserCommandLineForTests(CommandLine* command_line) {
   // Don't install default apps.
   command_line->AppendSwitch(switches::kDisableDefaultApps);
 
+  // Don't collect GPU info, load GPU blacklist, or schedule a GPU blacklist
+  // auto-update.
+  command_line->AppendSwitch(switches::kSkipGpuDataLoading);
+
 #if defined(USE_AURA)
   // Disable window animations under Ash as the animations effect the
   // coordinates returned and result in flake.
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc
index e6d8240..a1baa93 100644
--- a/chrome/test/gpu/gpu_feature_browsertest.cc
+++ b/chrome/test/gpu/gpu_feature_browsertest.cc
@@ -189,8 +189,8 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_AcceleratedCompositingAllowed) {
 
 class AcceleratedCompositingBlockedTest : public GpuFeatureTest {
  public:
-  virtual void SetUpOnMainThread() OVERRIDE {
-    GpuFeatureTest::SetUpOnMainThread();
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    GpuFeatureTest::SetUpInProcessBrowserTestFixture();
     const std::string json_blacklist =
       "{\n"
       "  \"name\": \"gpu blacklist\",\n"
@@ -216,7 +216,7 @@ class AcceleratedCompositingBlockedTest : public GpuFeatureTest {
 #endif
 
 IN_PROC_BROWSER_TEST_F(AcceleratedCompositingBlockedTest,
-                       MAYBE_AcceleratedCompositingBlocked) {
+    MAYBE_AcceleratedCompositingBlocked) {
   EXPECT_TRUE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
       gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING));
 
@@ -366,18 +366,11 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) {
   if (gpu::GPUTestBotConfig::CurrentConfigMatches("XP"))
     return;
 
-  bool is_blacklisted = false;
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-  // Blacklist rule #24 disables accelerated_2d_canvas on Linux.
-  is_blacklisted = true;
-#endif
-
-  EXPECT_EQ(is_blacklisted,
-            GpuDataManager::GetInstance()->IsFeatureBlacklisted(
-                gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS));
+  EXPECT_FALSE(GpuDataManager::GetInstance()->IsFeatureBlacklisted(
+      gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS));
 
   const base::FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
-  RunEventTest(url, kAcceleratedCanvasCreationEvent, !is_blacklisted);
+  RunEventTest(url, kAcceleratedCanvasCreationEvent, true);
 }
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DBlocked) {