Refactor content/common/gpu into gpu/ipc/service

gpu/ipc/service/gpu_channel_test_common.h

Index: gpu/ipc/service/gpu_channel_test_common.h
diff --git a/content/common/gpu/gpu_channel_test_common.h b/gpu/ipc/service/gpu_channel_test_common.h
similarity index 81%
rename from content/common/gpu/gpu_channel_test_common.h
rename to gpu/ipc/service/gpu_channel_test_common.h
index 1dacc6a07b6707695e3eea52252b50bf3f9a7258..70918b845cf729a8bb5f9dd0e3d00c2f98d760b9 100644
--- a/content/common/gpu/gpu_channel_test_common.h
+++ b/gpu/ipc/service/gpu_channel_test_common.h
@@ -5,10 +5,10 @@
 #include <stdint.h>
 
 #include "base/memory/scoped_ptr.h"
-#include "content/common/gpu/gpu_channel.h"
-#include "content/common/gpu/gpu_channel_manager.h"
-#include "content/common/gpu/gpu_channel_manager_delegate.h"
 #include "gpu/command_buffer/service/gpu_preferences.h"
+#include "gpu/ipc/service/gpu_channel.h"
+#include "gpu/ipc/service/gpu_channel_manager.h"
+#include "gpu/ipc/service/gpu_channel_manager_delegate.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -22,7 +22,7 @@ namespace IPC {
 class TestSink;
 }  // namespace IPC
 
-namespace content {
+namespace gpu {
 
 class SyncPointManager;
 
@@ -39,9 +39,9 @@ class TestGpuChannelManagerDelegate : public GpuChannelManagerDelegate {
   void DidDestroyChannel(int client_id) override;
   void DidDestroyOffscreenContext(const GURL& active_url) override;
   void DidLoseContext(bool offscreen,
-                      gpu::error::ContextLostReason reason,
+                      error::ContextLostReason reason,
                       const GURL& active_url) override;
-  void GpuMemoryUmaStats(const gpu::GPUMemoryUmaStats& params) override;
+  void GpuMemoryUmaStats(const GPUMemoryUmaStats& params) override;
   void RemoveSubscription(int32_t client_id, unsigned int target) override;
   void StoreShaderToDisk(int32_t client_id,
                          const std::string& key,
@@ -57,8 +57,8 @@ class TestGpuChannelManagerDelegate : public GpuChannelManagerDelegate {
 #endif
 #if defined(OS_WIN)
   void SendAcceleratedSurfaceCreatedChildWindow(
-      gpu::SurfaceHandle parent_window,
-      gpu::SurfaceHandle child_window) override;
+      SurfaceHandle parent_window,
+      SurfaceHandle child_window) override;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(TestGpuChannelManagerDelegate);
@@ -66,11 +66,11 @@ class TestGpuChannelManagerDelegate : public GpuChannelManagerDelegate {
 
 class TestGpuChannelManager : public GpuChannelManager {
  public:
-  TestGpuChannelManager(const gpu::GpuPreferences& gpu_preferences,
+  TestGpuChannelManager(const GpuPreferences& gpu_preferences,
                         GpuChannelManagerDelegate* delegate,
                         base::SingleThreadTaskRunner* task_runner,
                         base::SingleThreadTaskRunner* io_task_runner,
-                        gpu::SyncPointManager* sync_point_manager,
+                        SyncPointManager* sync_point_manager,
                         GpuMemoryBufferFactory* gpu_memory_buffer_factory);
   ~TestGpuChannelManager() override;
 
@@ -86,11 +86,11 @@ class TestGpuChannelManager : public GpuChannelManager {
 class TestGpuChannel : public GpuChannel {
  public:
   TestGpuChannel(GpuChannelManager* gpu_channel_manager,
-                 gpu::SyncPointManager* sync_point_manager,
+                 SyncPointManager* sync_point_manager,
                  gfx::GLShareGroup* share_group,
-                 gpu::gles2::MailboxManager* mailbox_manager,
-                 gpu::PreemptionFlag* preempting_flag,
-                 gpu::PreemptionFlag* preempted_flag,
+                 gles2::MailboxManager* mailbox_manager,
+                 PreemptionFlag* preempting_flag,
+                 PreemptionFlag* preempted_flag,
                  base::SingleThreadTaskRunner* task_runner,
                  base::SingleThreadTaskRunner* io_task_runner,
                  int client_id,
@@ -124,12 +124,12 @@ class GpuChannelTestCommon : public testing::Test {
   base::TestSimpleTaskRunner* task_runner() { return task_runner_.get(); }
 
  private:
-  gpu::GpuPreferences gpu_preferences_;
+  GpuPreferences gpu_preferences_;
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   scoped_refptr<base::TestSimpleTaskRunner> io_task_runner_;
-  scoped_ptr<gpu::SyncPointManager> sync_point_manager_;
+  scoped_ptr<SyncPointManager> sync_point_manager_;
   scoped_ptr<TestGpuChannelManagerDelegate> channel_manager_delegate_;
   scoped_ptr<GpuChannelManager> channel_manager_;
 };
 
-}  // namespace content
+}  // namespace gpu