Fix failing browser tests when running with force-compositing-mode. It uses new trace events checke…

chrome/browser/chrome_gpu_util.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 "chrome/browser/chrome_gpu_util.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/version.h"
@@ skipping 117 matching lines @@
   if (trial)
     trial->Disable();
 }
 
 bool ShouldRunCompositingFieldTrial() {
 // Enable the field trial only on desktop OS's.
 #if !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX))
   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
 
+  const GpuDataManager* gpu_data_manager = GpuDataManager::GetInstance();
+  content::GpuFeatureType blacklisted_features =
+      gpu_data_manager->GetBlacklistedFeatures();
+
+  // Don't run the field trial if gpu access has been blocked or
+  // accelerated compositing is blacklisted.
+  if (!gpu_data_manager->GpuAccessAllowed() ||
+      blacklisted_features & content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING)
+    return false;
+
   // The performance of accelerated compositing is too low with software
   // rendering.
-  if (content::GpuDataManager::GetInstance()->ShouldUseSoftwareRendering())
+  if (gpu_data_manager->ShouldUseSoftwareRendering())
     return false;
 
   // Don't activate the field trial if force-compositing-mode has been
   // explicitly disabled from the command line.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableForceCompositingMode))
+          switches::kDisableForceCompositingMode) ||
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableAcceleratedCompositing))
     return false;
 
   return true;
 }
 
 // Note: The compositing field trial may be created at startup time via the
 // Finch framework. In that case, all the Groups and probability values are
 // set before this function is called and any Field Trial setup calls
 // made here are simply ignored.
 // Early outs from this function intended to bypass activation of the field
@@ skipping 53 matching lines @@
 
   bool force_compositing = (trial->group() == force_compositing_group);
   bool thread = (trial->group() == thread_group);
   UMA_HISTOGRAM_BOOLEAN("GPU.InForceCompositingModeFieldTrial",
                         force_compositing);
   UMA_HISTOGRAM_BOOLEAN("GPU.InCompositorThreadFieldTrial", thread);
 }
 
 }  // namespace gpu_util;