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

content/common/gpu/gpu_channel.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_GPU_CHANNEL_H_
 #define CONTENT_COMMON_GPU_GPU_CHANNEL_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 10 matching lines @@
 #include "ipc/ipc_sync_channel.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/gl/gl_share_group.h"
 #include "ui/gl/gpu_preference.h"
 
 #if defined(OS_ANDROID)
 #include "content/common/android/surface_texture_peer.h"
 #endif
 
-class GpuChannelManager;
 struct GPUCreateCommandBufferConfig;
-class GpuWatchdog;
 
 namespace base {
 class MessageLoopProxy;
 class WaitableEvent;
 }
 
 namespace gpu {
 struct RefCountedCounter;
 namespace gles2 {
 class ImageManager;
 }
 }
 
 #if defined(OS_ANDROID)
 namespace content {
 class StreamTextureManagerAndroid;
 }
 #endif
 
+namespace content {
+class GpuChannelManager;
+class GpuWatchdog;
+
 // Encapsulates an IPC channel between the GPU process and one renderer
 // process. On the renderer side there's a corresponding GpuChannelHost.
 class GpuChannel : public IPC::Listener,
                    public IPC::Sender,
                    public base::RefCountedThreadSafe<GpuChannel> {
  public:
   // Takes ownership of the renderer process handle.
   GpuChannel(GpuChannelManager* gpu_channel_manager,
              GpuWatchdog* watchdog,
              gfx::GLShareGroup* share_group,
@@ skipping 65 matching lines @@
   gpu::RefCountedCounter* MessagesPendingCount() {
     return unprocessed_messages_.get();
   }
 
   // If preempt_by_counter->count is non-zero, any stub on this channel
   // should stop issuing GL commands. Setting this to NULL stops deferral.
   void SetPreemptByCounter(
       scoped_refptr<gpu::RefCountedCounter> preempt_by_counter);
 
 #if defined(OS_ANDROID)
-  content::StreamTextureManagerAndroid* stream_texture_manager() {
+  StreamTextureManagerAndroid* stream_texture_manager() {
     return stream_texture_manager_.get();
   }
 #endif
 
  protected:
   virtual ~GpuChannel();
 
  private:
   friend class base::RefCountedThreadSafe<GpuChannel>;
 
@@ skipping 12 matching lines @@
 
 #if defined(OS_ANDROID)
   // Register the StreamTextureProxy class with the gpu process so that all
   // the callbacks will be correctly forwarded to the renderer.
   void OnRegisterStreamTextureProxy(
       int32 stream_id, const gfx::Size& initial_size, int32* route_id);
 
   // Create a java surface texture object and send it to the renderer process
   // through binder thread.
   void OnEstablishStreamTexture(
-      int32 stream_id, content::SurfaceTexturePeer::SurfaceTextureTarget type,
+      int32 stream_id, SurfaceTexturePeer::SurfaceTextureTarget type,
       int32 primary_id, int32 secondary_id);
 #endif
 
   // Collect rendering stats.
   void OnCollectRenderingStatsForSurface(
       int32 surface_id, IPC::Message* reply_message);
 
   // The lifetime of objects of this class is managed by a GpuChannelManager.
   // The GpuChannelManager destroy all the GpuChannels that they own when they
   // are destroyed. So a raw pointer is safe.
@@ skipping 33 matching lines @@
 #endif  // defined (ENABLE_GPU)
 
   bool log_messages_;  // True if we should log sent and received messages.
   gpu::gles2::DisallowedFeatures disallowed_features_;
   GpuWatchdog* watchdog_;
   bool software_;
   bool handle_messages_scheduled_;
   bool processed_get_state_fast_;
 
 #if defined(OS_ANDROID)
-  scoped_ptr<content::StreamTextureManagerAndroid> stream_texture_manager_;
+  scoped_ptr<StreamTextureManagerAndroid> stream_texture_manager_;
 #endif
 
   base::WeakPtrFactory<GpuChannel> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannel);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_COMMON_GPU_GPU_CHANNEL_H_