Fix --single-process mode issues with GpuChannelHostFactory

content/common/gpu/client/gpu_channel_host.h

 // 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.
 
 #ifndef CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_
 #define CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 33 matching lines @@
 struct GpuListenerInfo {
   GpuListenerInfo();
   ~GpuListenerInfo();
 
   base::WeakPtr<IPC::Channel::Listener> listener;
   scoped_refptr<base::MessageLoopProxy> loop;
 };
 
 class CONTENT_EXPORT GpuChannelHostFactory {
  public:
-  virtual ~GpuChannelHostFactory();
-  static GpuChannelHostFactory* instance() { return instance_; }
+  virtual ~GpuChannelHostFactory() {}
 
   virtual bool IsMainThread() = 0;
   virtual bool IsIOThread() = 0;
   virtual MessageLoop* GetMainLoop() = 0;
   virtual scoped_refptr<base::MessageLoopProxy> GetIOLoopProxy() = 0;
   virtual base::WaitableEvent* GetShutDownEvent() = 0;
   virtual scoped_ptr<base::SharedMemory> AllocateSharedMemory(uint32 size) = 0;
   virtual int32 CreateViewCommandBuffer(
       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.
 // On the GPU process side there's a corresponding GpuChannel.
 class GpuChannelHost : public IPC::Message::Sender,
                        public base::RefCountedThreadSafe<GpuChannelHost> {
  public:
   enum State {
     // Not yet connected.
     kUnconnected,
@@ skipping 121 matching lines @@
   // for calls from contexts that may live on the compositor or main thread.
   mutable base::Lock context_lock_;
 
   // A filter for sending messages from thread other than the main thread.
   scoped_refptr<IPC::SyncMessageFilter> sync_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannelHost);
 };
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_