Fix --single-process mode issues with GpuChannelHostFactory

content/browser/gpu/browser_gpu_channel_host_factory.h

Index: content/browser/gpu/browser_gpu_channel_host_factory.h
diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.h b/content/browser/gpu/browser_gpu_channel_host_factory.h
index f9a7bd6a2eeed63a971b9d2f0d9a085d9f230ecf..cfb4e6a7329555f2eae8932cc7122292017ad53e 100644
--- a/content/browser/gpu/browser_gpu_channel_host_factory.h
+++ b/content/browser/gpu/browser_gpu_channel_host_factory.h
@@ -19,7 +19,7 @@ class BrowserGpuChannelHostFactory : public GpuChannelHostFactory {
  public:
   static void Initialize();
   static void Terminate();
-  static BrowserGpuChannelHostFactory* Get();
+  static BrowserGpuChannelHostFactory* instance() { return instance_; }
 
   // GpuChannelHostFactory implementation.
   virtual bool IsMainThread() OVERRIDE;
@@ -35,8 +35,6 @@ class BrowserGpuChannelHostFactory : public GpuChannelHostFactory {
   virtual GpuChannelHost* EstablishGpuChannelSync(
       CauseForGpuLaunch cause_for_gpu_launch) OVERRIDE;
 
- int gpu_client_id() { return gpu_client_id_; }
-
  private:
   struct CreateRequest {
     CreateRequest();
@@ -75,6 +73,8 @@ class BrowserGpuChannelHostFactory : public GpuChannelHostFactory {
   scoped_refptr<GpuChannelHost> gpu_channel_;
   int gpu_host_id_;
 
+  static BrowserGpuChannelHostFactory* instance_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserGpuChannelHostFactory);
 };