Revert 222105 "Enable GPU blacklist in tests."

Failed on mac-asan bot:
http://build.chromium.org/p/chromium.memory/builders/Mac%20ASAN%20Tests%20%281%29/builds/14510

AcceleratedCompositingBlockedTest.AcceleratedCompositingBlocked: 
[7719:3847:0909/155847:1828989999085:INFO:gpu_control_list.cc(1043)] Control list match for rule #48.
[7719:3847:0909/155847:1829419815783:INFO:gpu_control_list.cc(1043)] Control list match for rule #48.
[7719:3847:0909/155847:1829591550844:INFO:gpu_control_list.cc(1043)] Control list match for rule #.
../../chrome/test/gpu/gpu_feature_browsertest.cc:143: Failure
Value of: 0U
Actual: 0
Expected: event_count
Which is: 1

> Enable GPU blacklist in tests.
> 
> Partial re-land of https://codereview.chromium.org/22198004/) -- Always enable FCM on Windows -- Part 1/3.
> 
> On top of fixing some of the issues there; only lands the part that enables the GPU blacklist in tests as the former CL is too hard to land all at once.
> 
> Also keeping --skip-gpu-data-loading around for now to be able to deal with failures caused in layout_tests by this on their own later (this needs to land ASAP and layout_tests don't need this ASAP).
> 
> Another CL will follow to always enable FCM on non-blacklisted Windows machines.
> 
> This part re-enables loading the blacklist in tests (and adds a content_browsertest to make sure that the configuration we expect to be testing is indeed the one we are testing -- this uncertainty is basically the only reason the blacklist was explicitly disabled before).
> 
> This CL also cleans up compositor_util.cc which was enforcing the blacklist twice.
> 
> The original plan was to do this only for Windows as Mac/Linux was causing trouble, but it turns out to be harder to do it only on Windows; so taking care of http://crbug.com/277242 in this CL too after all... 
> 
> BUG=233830, 267038, 190942, 277242
> TBR=jcivelli, piman 
> 
> Originally Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=219132 
> Then Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=219159
> 
> Then re-committed (part 1/3): https://src.chromium.org/viewvc/chrome?view=rev&revision=221114
> Reverted in: https://src.chromium.org/viewvc/chrome?view=rev&revision=221145
> 
> Review URL: https://chromiumcodereview.appspot.com/23534006

TBR=gab@chromium.org

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

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

1 files changed, 26 insertions, 0 deletions

diff --git a/chrome/browser/gpu/chrome_gpu_util.cc b/chrome/browser/gpu/chrome_gpu_util.cc
index c2f646d..61da773 100644
--- a/chrome/browser/gpu/chrome_gpu_util.cc
+++ b/chrome/browser/gpu/chrome_gpu_util.cc
@@ -40,6 +40,32 @@ bool ShouldRunCompositingFieldTrial() {
   return false;
 #endif
 
+// Necessary for linux_chromeos build since it defines both OS_LINUX
+// and OS_CHROMEOS.
+#if defined(OS_CHROMEOS)
+  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(