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

content/gpu/in_process_gpu_thread.cc

Index: content/gpu/in_process_gpu_thread.cc
diff --git a/content/gpu/in_process_gpu_thread.cc b/content/gpu/in_process_gpu_thread.cc
index cb1c880df293b8b04238da0f48ee94fbc34e7414..ccd3594a4d06621a1ba7eb3ba028d68b105eef14 100644
--- a/content/gpu/in_process_gpu_thread.cc
+++ b/content/gpu/in_process_gpu_thread.cc
@@ -6,11 +6,11 @@
 
 #include "base/time/time.h"
 #include "build/build_config.h"
+#include "content/common/gpu/gpu_memory_buffer_factory.h"
 #include "content/gpu/gpu_child_thread.h"
 #include "content/gpu/gpu_process.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
-#include "gpu/ipc/service/gpu_memory_buffer_factory.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
@@ -29,8 +29,8 @@
       sync_point_manager_override_(sync_point_manager_override),
       gpu_memory_buffer_factory_(
           gpu::GetNativeGpuMemoryBufferType() != gfx::EMPTY_BUFFER
-          ? gpu::GpuMemoryBufferFactory::CreateNativeType()
-          : nullptr) {
+              ? GpuMemoryBufferFactory::CreateNativeType()
+              : nullptr) {
   if (!sync_point_manager_override_) {
     sync_point_manager_.reset(new gpu::SyncPointManager(false));
     sync_point_manager_override_ = sync_point_manager_.get();