Fix --single-process mode issues with GpuChannelHostFactory

content/common/gpu/client/gpu_channel_host.h

Index: content/common/gpu/client/gpu_channel_host.h
diff --git a/content/common/gpu/client/gpu_channel_host.h b/content/common/gpu/client/gpu_channel_host.h
index ef8e438d4563ce15f8528f89905e31b8f60a4392..0a4e178e76076ea16f1eb040d3156d5c7a37c7ef 100644
--- a/content/common/gpu/client/gpu_channel_host.h
+++ b/content/common/gpu/client/gpu_channel_host.h
@@ -51,8 +51,7 @@ struct GpuListenerInfo {
 
 class CONTENT_EXPORT GpuChannelHostFactory {
  public:
-  virtual ~GpuChannelHostFactory();
-  static GpuChannelHostFactory* instance() { return instance_; }
+  virtual ~GpuChannelHostFactory() {}
 
   virtual bool IsMainThread() = 0;
   virtual bool IsIOThread() = 0;
@@ -64,14 +63,6 @@ class CONTENT_EXPORT GpuChannelHostFactory {
       int32 surface_id, const GPUCreateCommandBufferConfig& init_params) = 0;
   virtual GpuChannelHost* EstablishGpuChannelSync(
       content::CauseForGpuLaunch) = 0;
-
- protected:
-  static void set_instance(GpuChannelHostFactory* instance) {
-    instance_ = instance;
-  }
-
- private:
-  static GpuChannelHostFactory* instance_;
 };
 
 // Encapsulates an IPC channel between the client and one GPU process.