Make GpuDataManager thread safe.

chrome/browser/gpu_blacklist.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/gpu_blacklist.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
@@ skipping 1035 matching lines @@
         type |= blacklist_[i]->GetGpuFeatureType();
       active_entries_.push_back(blacklist_[i]);
     }
   }
   return static_cast<GpuFeatureType>(type);
 }
 
 void GpuBlacklist::UpdateGpuDataManager() {
   content::GpuFeatureType feature_type = DetermineGpuFeatureType(
       GpuBlacklist::kOsAny, NULL, GpuDataManager::GetInstance()->GetGPUInfo());
-  GpuDataManager::GetInstance()->SetGpuFeatureType(feature_type);
+  GpuDataManager::GetInstance()->SetPreliminaryBlacklistedFeatures(
+      feature_type);
   gpu_util::UpdateStats();
 }
 
 void GpuBlacklist::GetGpuFeatureTypeEntries(
     content::GpuFeatureType feature,
     std::vector<uint32>& entry_ids,
     bool disabled) const {
   entry_ids.clear();
   for (size_t i = 0; i < active_entries_.size(); ++i) {
     if (((feature & active_entries_[i]->GetGpuFeatureType()) != 0) &&
@@ skipping 111 matching lines @@
   if (op == ">")
     return kGT;
   if (op == ">=")
     return kGE;
   if (op == "any")
     return kAny;
   if (op == "between")
     return kBetween;
   return kUnknown;
 }