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

content/gpu/in_process_gpu_thread.h

Index: content/gpu/in_process_gpu_thread.h
diff --git a/content/gpu/in_process_gpu_thread.h b/content/gpu/in_process_gpu_thread.h
index 88e349e06acf02f72f402a9cea27fcc55f3e0db5..6124ba86f6cfba4f55fefd2eccb11ed817117958 100644
--- a/content/gpu/in_process_gpu_thread.h
+++ b/content/gpu/in_process_gpu_thread.h
@@ -12,13 +12,13 @@
 #include "gpu/command_buffer/service/gpu_preferences.h"
 
 namespace gpu {
-class GpuMemoryBufferFactory;
+struct GpuPreferences;
 class SyncPointManager;
-struct GpuPreferences;
 }
 
 namespace content {
 
+class GpuMemoryBufferFactory;
 class GpuProcess;
 
 // This class creates a GPU thread (instead of a GPU process), when running
@@ -48,7 +48,7 @@
   // Non-owning.
   gpu::SyncPointManager* sync_point_manager_override_;
 
-  scoped_ptr<gpu::GpuMemoryBufferFactory> gpu_memory_buffer_factory_;
+  scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessGpuThread);
 };