Restore the gpu blacklist logic.

content/browser/gpu/gpu_data_manager.cc

 // Copyright (c) 2011 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 "content/browser/gpu/gpu_data_manager.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 167 matching lines @@
   if (gpu_blacklist == NULL)
     return;
 
   // We don't set a lock around modifying gpu_feature_flags_ since it's just an
   // int.
   if (!gpu_blacklist) {
     gpu_feature_flags_.set_flags(0);
     return;
   }
 
+  {
+    base::AutoLock auto_lock(gpu_info_lock_);
+    gpu_feature_flags_ = gpu_blacklist->DetermineGpuFeatureFlags(
+        GpuBlacklist::kOsAny, NULL, gpu_info_);
+  }
+
   uint32 max_entry_id = gpu_blacklist->max_entry_id();
   if (!gpu_feature_flags_.flags()) {
     UMA_HISTOGRAM_ENUMERATION("GPU.BlacklistTestResultsPerEntry",
         0, max_entry_id + 1);
     return;
   }
 
   // Notify clients that GpuInfo state has changed
   RunGpuInfoUpdateCallbacks();
 
@@ skipping 13 matching lines @@
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
   if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) ||
       browser_command_line.GetSwitchValueASCII(
           switches::kUseGL) == gfx::kGLImplementationOSMesaName)
     return NULL;
   // No need to return an empty blacklist.
   if (gpu_blacklist_.get() != NULL && gpu_blacklist_->max_entry_id() == 0)
     return NULL;
   return gpu_blacklist_.get();
 }