SurfaceTexture* => gpu/ipc/common

content/browser/android/in_process_surface_texture_manager.h

 // Copyright 2015 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_BROWSER_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_
 #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_
 
-#include "content/common/android/surface_texture_manager.h"
+#include "gpu/ipc/common/android/surface_texture_manager.h"
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
-#include "content/common/android/surface_texture_peer.h"
 #include "content/common/content_export.h"
+#include "gpu/ipc/common/android/surface_texture_peer.h"
 #include "ui/gl/android/scoped_java_surface.h"
 
 namespace content {
 
 class CONTENT_EXPORT InProcessSurfaceTextureManager
-    : public SurfaceTextureManager,
-      public SurfaceTexturePeer {
+    : public gpu::SurfaceTextureManager,
+      public gpu::SurfaceTexturePeer {
  public:
   static InProcessSurfaceTextureManager* GetInstance();
 
   // Overridden from SurfaceTextureManager:
   void RegisterSurfaceTexture(int surface_texture_id,
                               int client_id,
                               gfx::SurfaceTexture* surface_texture) override;
   void UnregisterSurfaceTexture(int surface_texture_id, int client_id) override;
   gfx::AcceleratedWidget AcquireNativeWidgetForSurfaceTexture(
       int surface_texture_id) override;
@@ skipping 15 matching lines @@
       base::ScopedPtrHashMap<int, scoped_ptr<gfx::ScopedJavaSurface>>;
   SurfaceTextureMap surface_textures_;
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessSurfaceTextureManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_