Fix --single-process mode issues with GpuChannelHostFactory

content/browser/gpu/browser_gpu_channel_host_factory.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/gpu/browser_gpu_channel_host_factory.h"
 
 #include "base/bind.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_client.h"
 
 namespace content {
 
+BrowserGpuChannelHostFactory* BrowserGpuChannelHostFactory::instance_ = NULL;
+
 BrowserGpuChannelHostFactory::CreateRequest::CreateRequest()
     : event(false, false),
       route_id(MSG_ROUTING_NONE) {
 }
 
 BrowserGpuChannelHostFactory::CreateRequest::~CreateRequest() {
 }
 
 BrowserGpuChannelHostFactory::EstablishRequest::EstablishRequest()
     : event(false, false),
       gpu_process_handle(base::kNullProcessHandle) {
 }
 
 BrowserGpuChannelHostFactory::EstablishRequest::~EstablishRequest() {
 }
 
 void BrowserGpuChannelHostFactory::Initialize() {
-  new BrowserGpuChannelHostFactory();
+  instance_ = new BrowserGpuChannelHostFactory();
 }
 
 void BrowserGpuChannelHostFactory::Terminate() {
-  delete instance();
-}
-
-BrowserGpuChannelHostFactory* BrowserGpuChannelHostFactory::Get() {
-  return static_cast<BrowserGpuChannelHostFactory*>(instance());
+  delete instance_;
+  instance_ = NULL;
 }
 
 BrowserGpuChannelHostFactory::BrowserGpuChannelHostFactory()
     : gpu_client_id_(ChildProcessHostImpl::GenerateChildProcessUniqueId()),
       shutdown_event_(new base::WaitableEvent(true, false)),
       gpu_host_id_(0) {
-  set_instance(this);
 }
 
 BrowserGpuChannelHostFactory::~BrowserGpuChannelHostFactory() {
   shutdown_event_->Signal();
-  set_instance(NULL);
 }
 
 bool BrowserGpuChannelHostFactory::IsMainThread() {
   return BrowserThread::CurrentlyOn(BrowserThread::UI);
 }
 
 bool BrowserGpuChannelHostFactory::IsIOThread() {
   return BrowserThread::CurrentlyOn(BrowserThread::IO);
 }
 
@@ skipping 145 matching lines @@
   gpu_channel_->set_gpu_info(request.gpu_info);
   content::GetContentClient()->SetGpuInfo(request.gpu_info);
 
   // Connect to the GPU process if a channel name was received.
   gpu_channel_->Connect(request.channel_handle, browser_process_for_gpu);
 
   return gpu_channel_.get();
 }
 
 }  // namespace content