Revert 223397 "Enable GPU blacklist in tests."

trunk/src/content/browser/gpu/gpu_data_manager_impl_private.cc

Index: trunk/src/content/browser/gpu/gpu_data_manager_impl_private.cc
===================================================================
--- trunk/src/content/browser/gpu/gpu_data_manager_impl_private.cc	(revision 223455)
+++ trunk/src/content/browser/gpu/gpu_data_manager_impl_private.cc	(working copy)
@@ -332,9 +332,6 @@
   // This function is for testing only, so disable histograms.
   update_histograms_ = false;
 
-  // Prevent all further initialization.
-  finalized_ = true;
-
   InitializeImpl(gpu_blacklist_json, std::string(), std::string(), gpu_info);
 }
 
@@ -548,35 +545,13 @@
 
 void GpuDataManagerImplPrivate::Initialize() {
   TRACE_EVENT0("startup", "GpuDataManagerImpl::Initialize");
-  if (finalized_) {
-    DLOG(INFO) << "GpuDataManagerImpl marked as finalized; skipping Initialize";
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kSkipGpuDataLoading) &&
+      !command_line->HasSwitch(switches::kUseGpuInTests))
     return;
-  }
 
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kSkipGpuDataLoading))
-    return;
-
   gpu::GPUInfo gpu_info;
-  if (command_line->GetSwitchValueASCII(
-          switches::kUseGL) == gfx::kGLImplementationOSMesaName) {
-    // If using the OSMesa GL implementation, use fake vendor and device ids to
-    // make sure it never gets blacklisted. This is better than simply
-    // cancelling GPUInfo gathering as it allows us to proceed with loading the
-    // blacklist below which may have non-device specific entries we want to
-    // apply anyways (e.g., OS version blacklisting).
-    gpu_info.gpu.vendor_id = 0xffff;
-    gpu_info.gpu.device_id = 0xffff;
-
-    // Hardcode some values otherwise some blacklisting rules in
-    // kSoftwareRenderingListJson result in a positive match as GpuControlList
-    // assumes a match (by design) when a property is required for the
-    // verification yet not present in the GpuInfo.
-    gpu_info.driver_vendor =
-        gfx::kGLImplementationOSMesaName;  // Bypass rule #74.
-    gpu_info.driver_date = "2013.8";  // Bypass rules #12 and #55.
-    gpu_info.driver_version = "9.0.3";  // Bypass rule #23.
-  } else {
+  {
     TRACE_EVENT0("startup",
       "GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo");
     gpu::CollectBasicGraphicsInfo(&gpu_info);
@@ -1010,8 +985,7 @@
       owner_(owner),
       display_count_(0),
       gpu_process_accessible_(true),
-      use_software_compositor_(false),
-      finalized_(false) {
+      use_software_compositor_(false) {
   DCHECK(owner_);
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kDisableAcceleratedCompositing)) {
@@ -1058,10 +1032,6 @@
 
   if (!gpu_blacklist_json.empty()) {
     gpu_blacklist_.reset(gpu::GpuBlacklist::Create());
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kLogGpuControlListDecisions)) {
-      gpu_blacklist_->enable_control_list_logging();
-    }
     gpu_blacklist_->LoadList(
         browser_version_string, gpu_blacklist_json,
         gpu::GpuControlList::kCurrentOsOnly);