Make GpuDataManager thread safe.

content/browser/web_contents/web_contents_impl.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 "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 536 matching lines @@
     prefs.enable_scroll_animator = true;
   if (command_line.HasSwitch(switches::kDisableSmoothScrolling))
     prefs.enable_scroll_animator = false;
 
   prefs.visual_word_movement_enabled =
       command_line.HasSwitch(switches::kEnableVisualWordMovement);
 
   {  // Certain GPU features might have been blacklisted.
     GpuDataManagerImpl* gpu_data_manager = GpuDataManagerImpl::GetInstance();
     DCHECK(gpu_data_manager);
-    uint32 blacklist_type = gpu_data_manager->GetGpuFeatureType();
+    uint32 blacklist_type = gpu_data_manager->GetBlacklistedFeatures();
     if (blacklist_type & content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING)
       prefs.accelerated_compositing_enabled = false;
     if (blacklist_type & content::GPU_FEATURE_TYPE_WEBGL)
       prefs.experimental_webgl_enabled = false;
     if (blacklist_type & content::GPU_FEATURE_TYPE_FLASH3D)
       prefs.flash_3d_enabled = false;
     if (blacklist_type & content::GPU_FEATURE_TYPE_FLASH_STAGE3D)
       prefs.flash_stage3d_enabled = false;
     if (blacklist_type & content::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)
       prefs.accelerated_2d_canvas_enabled = false;
@@ skipping 2685 matching lines @@
       old_browser_plugin_host()->embedder_render_process_host();
   *embedder_container_id = old_browser_plugin_host()->instance_id();
   int embedder_process_id =
       embedder_render_process_host ? embedder_render_process_host->GetID() : -1;
   if (embedder_process_id != -1) {
     *embedder_channel_name =
         StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(),
                      embedder_process_id);
   }
 }