Make GpuDataManager thread safe.

chrome/browser/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/gpu_util.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 280 matching lines @@
     if (!matches.size())
       matches.push_back(kGpuFeatureNameUnknown);
   }
   return JoinString(matches, ',');
 }
 
 Value* GetFeatureStatus() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   bool gpu_access_blocked = !GpuDataManager::GetInstance()->GpuAccessAllowed();
 
-  uint32 flags = GpuDataManager::GetInstance()->GetGpuFeatureType();
+  uint32 flags = GpuDataManager::GetInstance()->GetBlacklistedFeatures();
   DictionaryValue* status = new DictionaryValue();
 
   const GpuFeatureInfo kGpuFeatureInfo[] = {
       {
           "2d_canvas",
           flags & content::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS,
           command_line.HasSwitch(switches::kDisableAccelerated2dCanvas) ||
           !SupportsAccelerated2dCanvas(),
           "Accelerated 2D canvas is unavailable: either disabled at the command"
           " line or not supported by the current system.",
@@ skipping 230 matching lines @@
 
 void UpdateStats() {
   GpuBlacklist* blacklist = GpuBlacklist::GetInstance();
   uint32 max_entry_id = blacklist->max_entry_id();
   if (max_entry_id == 0) {
     // GPU Blacklist was not loaded.  No need to go further.
     return;
   }
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  uint32 flags = GpuDataManager::GetInstance()->GetGpuFeatureType();
+  uint32 flags = GpuDataManager::GetInstance()->GetBlacklistedFeatures();
   bool disabled = false;
   if (flags == 0) {
     UMA_HISTOGRAM_ENUMERATION("GPU.BlacklistTestResultsPerEntry",
         0, max_entry_id + 1);
   } else {
     std::vector<uint32> flag_entries;
     blacklist->GetGpuFeatureTypeEntries(
         content::GPU_FEATURE_TYPE_ALL, flag_entries, disabled);
     DCHECK_GT(flag_entries.size(), 0u);
     for (size_t i = 0; i < flag_entries.size(); ++i) {
@@ skipping 59 matching lines @@
         kGpuBlacklistFeatureHistogramNamesWin[i],
         1, kNumWinSubVersions * kGpuFeatureNumStatus,
         kNumWinSubVersions * kGpuFeatureNumStatus + 1,
         base::Histogram::kUmaTargetedHistogramFlag);
     histogram_pointer->Add(GetGpuBlacklistHistogramValueWin(value));
 #endif
   }
 }
 
 }  // namespace gpu_util;