Moved code that runs in both the browser and GPU process from content/gpu to content/common/gpu.

content/gpu/gpu_child_thread.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #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_info.h"
-#include "content/gpu/gpu_channel.h"
-#include "content/gpu/gpu_config.h"
-#include "content/gpu/gpu_render_thread.h"
-#include "content/gpu/x_util.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/gpu_info.h"
+#include "content/common/gpu/x_util.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace IPC {
 struct ChannelHandle;
 }
 
 namespace sandbox {
 class TargetServices;
 }
 
 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 GpuRenderThread, which is responsible for issuing rendering
+// IPC messages to GpuChannelManager, which is responsible for issuing rendering
 // commands to the GPU.
 class GpuChildThread : public ChildThread {
  public:
 #if defined(OS_WIN)
   explicit GpuChildThread(sandbox::TargetServices* target_services);
 #else
   GpuChildThread();
 #endif
 
   // For single-process mode.
@@ skipping 24 matching lines @@
   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<GpuRenderThread> render_thread_;
+  scoped_ptr<GpuChannelManager> gpu_channel_manager_;
 
   // Information about the GPU, such as device and vendor ID.
   GPUInfo gpu_info_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChildThread);
 };
 
 #endif  // CONTENT_GPU_GPU_CHILD_THREAD_H_