Revert "Refactor GpuDataManagerImpl to make it thread-safe."

Breaks compile on Linux ChromiumOS Builder
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Builder/builds/42709/steps/compile/logs/stdio#error1

TBR=zmo@google.com
BUG=232556

Review URL: https://codereview.chromium.org/15175004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200087 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 4 deletions

diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc
index 6419ba8..eb7646c 100644
--- a/content/browser/gpu/gpu_internals_ui.cc
+++ b/content/browser/gpu/gpu_internals_ui.cc
@@ -479,7 +479,9 @@ class GpuMessageHandler
 
   // GpuDataManagerObserver implementation.
   virtual void OnGpuInfoUpdate() OVERRIDE;
-  virtual void OnGpuSwitching() OVERRIDE;
+
+  // Gpu switch handler.
+  void OnGpuSwitch();
 
   // Messages
   void OnBrowserBridgeInitialized(const base::ListValue* list);
@@ -494,6 +496,8 @@ class GpuMessageHandler
   // DCHECK).
   bool observing_;
 
+  GpuDataManagerImpl::GpuSwitchCallback gpu_switch_callback_;
+
   DISALLOW_COPY_AND_ASSIGN(GpuMessageHandler);
 };
 
@@ -504,11 +508,15 @@ class GpuMessageHandler
 ////////////////////////////////////////////////////////////////////////////////
 
 GpuMessageHandler::GpuMessageHandler()
-    : observing_(false) {
+    : observing_(false),
+      gpu_switch_callback_(base::Bind(&GpuMessageHandler::OnGpuSwitch,
+                                      base::Unretained(this))) {
 }
 
 GpuMessageHandler::~GpuMessageHandler() {
   GpuDataManagerImpl::GetInstance()->RemoveObserver(this);
+  GpuDataManagerImpl::GetInstance()->RemoveGpuSwitchCallback(
+      gpu_switch_callback_);
 }
 
 /* BrowserBridge.callAsync prepends a requestID to these messages. */
@@ -575,8 +583,11 @@ void GpuMessageHandler::OnBrowserBridgeInitialized(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Watch for changes in GPUInfo
-  if (!observing_)
+  if (!observing_) {
     GpuDataManagerImpl::GetInstance()->AddObserver(this);
+    GpuDataManagerImpl::GetInstance()->AddGpuSwitchCallback(
+        gpu_switch_callback_);
+  }
   observing_ = true;
 
   // Tell GpuDataManager it should have full GpuInfo. If the
@@ -628,7 +639,7 @@ void GpuMessageHandler::OnGpuInfoUpdate() {
       *(gpu_info_val.get()));
 }
 
-void GpuMessageHandler::OnGpuSwitching() {
+void GpuMessageHandler::OnGpuSwitch() {
   GpuDataManagerImpl::GetInstance()->RequestCompleteGpuInfoIfNeeded();
 }