Move a bunch of code in content\common (as well as a few left in renderer) to the content namespace.

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_
 
 #include <string>
 #include <vector>
 
@@ skipping 10 matching lines @@
 #include "content/common/message_router.h"
 #include "content/public/common/gpu_info.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/gl/gpu_preference.h"
 
 class CommandBufferProxy;
-class CommandBufferProxyImpl;
+class GURL;
+class MessageLoop;
+class TransportTextureService;
 struct GPUCreateCommandBufferConfig;
-class GURL;
-class TransportTextureService;
-class MessageLoop;
 
 namespace base {
 class MessageLoopProxy;
 }
 
-namespace content {
-struct GpuRenderingStats;
-}
-
 namespace IPC {
 class SyncMessageFilter;
 }
 
+namespace content {
+class CommandBufferProxyImpl;
+struct GpuRenderingStats;
+
 struct GpuListenerInfo {
   GpuListenerInfo();
   ~GpuListenerInfo();
 
   base::WeakPtr<IPC::Listener> listener;
   scoped_refptr<base::MessageLoopProxy> loop;
 };
 
 class CONTENT_EXPORT GpuChannelHostFactory {
  public:
   typedef base::Callback<void(const gfx::Size)> CreateImageCallback;
 
   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;
+  virtual GpuChannelHost* EstablishGpuChannelSync(CauseForGpuLaunch) = 0;
   virtual void CreateImage(
       gfx::PluginWindowHandle window,
       int32 image_id,
       const CreateImageCallback& callback) = 0;
   virtual void DeleteImage(int32 image_id, int32 sync_point) = 0;
 };
 
 // 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::Sender,
@@ skipping 16 matching lines @@
 
   // Connect to GPU process channel.
   void Connect(const IPC::ChannelHandle& channel_handle);
 
   State state() const { return state_; }
 
   // Change state to kLost.
   void SetStateLost();
 
   // The GPU stats reported by the GPU process.
-  void set_gpu_info(const content::GPUInfo& gpu_info);
-  const content::GPUInfo& gpu_info() const;
+  void set_gpu_info(const GPUInfo& gpu_info);
+  const GPUInfo& gpu_info() const;
 
   void OnChannelError();
 
   // IPC::Sender implementation:
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // Create and connect to a command buffer in the GPU process.
   CommandBufferProxy* CreateViewCommandBuffer(
       int32 surface_id,
       CommandBufferProxy* share_group,
@@ skipping 16 matching lines @@
   GpuVideoDecodeAcceleratorHost* CreateVideoDecoder(
       int command_buffer_route_id,
       media::VideoCodecProfile profile,
       media::VideoDecodeAccelerator::Client* client);
 
   // Destroy a command buffer created by this channel.
   void DestroyCommandBuffer(CommandBufferProxy* command_buffer);
 
   // Collect rendering stats from GPU process.
   bool CollectRenderingStatsForSurface(
-      int surface_id, content::GpuRenderingStats* stats);
+      int surface_id, GpuRenderingStats* stats);
 
   // Add a route for the current message loop.
   void AddRoute(int route_id, base::WeakPtr<IPC::Listener> listener);
   void RemoveRoute(int route_id);
 
   GpuChannelHostFactory* factory() const { return factory_; }
   int gpu_host_id() const { return gpu_host_id_; }
   base::ProcessId gpu_pid() const { return channel_->peer_pid(); }
   int client_id() const { return client_id_; }
 
@@ skipping 24 matching lines @@
     typedef base::hash_map<int, GpuListenerInfo> ListenerMap;
     ListenerMap listeners_;
   };
 
   GpuChannelHostFactory* factory_;
   int client_id_;
   int gpu_host_id_;
 
   State state_;
 
-  content::GPUInfo gpu_info_;
+  GPUInfo gpu_info_;
 
   scoped_ptr<IPC::SyncChannel> channel_;
   scoped_refptr<MessageFilter> channel_filter_;
 
   // Used to look up a proxy from its routing id.
   typedef base::hash_map<int, CommandBufferProxyImpl*> ProxyMap;
   ProxyMap proxies_;
 
   // A lock to guard against concurrent access to members like the proxies map
   // 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);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_