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

content/gpu/gpu_child_thread.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_GPU_GPU_CHILD_THREAD_H_
 #define CONTENT_GPU_GPU_CHILD_THREAD_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "build/build_config.h"
 #include "content/common/child_thread.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_config.h"
 #include "content/common/gpu/x_util.h"
 #include "content/public/common/gpu_info.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace sandbox {
 class TargetServices;
 }
 
+namespace content {
 class GpuWatchdogThread;
 
 // The main thread of the GPU child process. There will only ever be one of
 // these per process. It does process initialization and shutdown. It forwards
 // IPC messages to GpuChannelManager, which is responsible for issuing rendering
 // commands to the GPU.
 class GpuChildThread : public ChildThread {
  public:
-  explicit GpuChildThread(bool dead_on_arrival,
-                          const content::GPUInfo& gpu_info);
+  explicit GpuChildThread(bool dead_on_arrival, const GPUInfo& gpu_info);
 
   // For single-process mode.
   explicit GpuChildThread(const std::string& channel_id);
 
   virtual ~GpuChildThread();
 
   void Init(const base::Time& process_start_time);
   void StopWatchdog();
 
   // ChildThread overrides.
@@ skipping 11 matching lines @@
   void OnCrash();
   void OnHang();
 
 #if defined(USE_TCMALLOC)
   void OnGetGpuTcmalloc();
 #endif
 
 #if defined(OS_WIN)
   static void CollectDxDiagnostics(GpuChildThread* thread);
   static void SetDxDiagnostics(GpuChildThread* thread,
-                               const content::DxDiagNode& node);
+                               const DxDiagNode& node);
 #endif
 
   // Set this flag to true if a fatal error occurred before we receive the
   // OnInitialize message, in which case we just declare ourselves DOA.
   bool dead_on_arrival_;
   base::Time process_start_time_;
   scoped_refptr<GpuWatchdogThread> watchdog_thread_;
 
 #if defined(OS_WIN)
   // Windows specific client sandbox interface.
   sandbox::TargetServices* target_services_;
 
   // Indicates whether DirectX Diagnostics collection is ongoing.
   bool collecting_dx_diagnostics_;
 #endif
 
   scoped_ptr<GpuChannelManager> gpu_channel_manager_;
 
   // Information about the GPU, such as device and vendor ID.
-  content::GPUInfo gpu_info_;
+  GPUInfo gpu_info_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChildThread);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_GPU_GPU_CHILD_THREAD_H_