Move more files to gpu/ipc/common

content/app/android/child_process_service.cc

Index: content/app/android/child_process_service.cc
diff --git a/content/app/android/child_process_service.cc b/content/app/android/child_process_service.cc
index 0e2bfc2b028d89a3f07e5f5810e7387a142b1146..e9147712e279d187aa32205767be43e1b70a6db7 100644
--- a/content/app/android/child_process_service.cc
+++ b/content/app/android/child_process_service.cc
@@ -14,10 +14,10 @@
 #include "base/macros.h"
 #include "base/posix/global_descriptors.h"
 #include "content/child/child_thread_impl.h"
-#include "content/common/gpu/gpu_surface_lookup.h"
 #include "content/public/common/content_descriptors.h"
 #include "gpu/ipc/common/android/surface_texture_manager.h"
 #include "gpu/ipc/common/android/surface_texture_peer.h"
+#include "gpu/ipc/common/gpu_surface_lookup.h"
 #include "ipc/ipc_descriptors.h"
 #include "jni/ChildProcessService_jni.h"
 #include "ui/gl/android/scoped_java_surface.h"
@@ -34,7 +34,7 @@ namespace {
 // we're in a renderer or gpu process.
 class SurfaceTextureManagerImpl : public gpu::SurfaceTextureManager,
                                   public gpu::SurfaceTexturePeer,
-                                  public GpuSurfaceLookup {
+                                  public gpu::GpuSurfaceLookup {
  public:
   // |service| is the instance of
   // org.chromium.content.app.ChildProcessService.
@@ -42,11 +42,11 @@ class SurfaceTextureManagerImpl : public gpu::SurfaceTextureManager,
       const base::android::JavaRef<jobject>& service)
       : service_(service) {
     SurfaceTexturePeer::InitInstance(this);
-    GpuSurfaceLookup::InitInstance(this);
+    gpu::GpuSurfaceLookup::InitInstance(this);
   }
   ~SurfaceTextureManagerImpl() override {
     SurfaceTexturePeer::InitInstance(NULL);
-    GpuSurfaceLookup::InitInstance(NULL);
+    gpu::GpuSurfaceLookup::InitInstance(NULL);
   }
 
   // Overridden from SurfaceTextureManager:
@@ -103,7 +103,7 @@ class SurfaceTextureManagerImpl : public gpu::SurfaceTextureManager,
         secondary_id);
   }
 
-  // Overridden from GpuSurfaceLookup:
+  // Overridden from gpu::GpuSurfaceLookup:
   gfx::AcceleratedWidget AcquireNativeWidget(int surface_id) override {
     JNIEnv* env = base::android::AttachCurrentThread();
     gfx::ScopedJavaSurface surface(
@@ -123,7 +123,7 @@ class SurfaceTextureManagerImpl : public gpu::SurfaceTextureManager,
     return native_window;
   }
 
-  // Overridden from GpuSurfaceLookup:
+  // Overridden from gpu::GpuSurfaceLookup:
   gfx::ScopedJavaSurface AcquireJavaSurface(int surface_id) override {
     JNIEnv* env = base::android::AttachCurrentThread();
     return gfx::ScopedJavaSurface(