SurfaceTexture* => gpu/ipc/common

content/renderer/media/android/stream_texture_factory_synchronous_impl.cc

 // Copyright 2014 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.
 
 #include "content/renderer/media/android/stream_texture_factory_synchronous_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process_handle.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "cc/output/context_provider.h"
-#include "content/common/android/surface_texture_peer.h"
 #include "content/renderer/render_thread_impl.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
+#include "gpu/ipc/common/android/surface_texture_peer.h"
 #include "ui/gl/android/surface_texture.h"
 
 using gpu::gles2::GLES2Interface;
 
 namespace content {
 
 namespace {
 
 class StreamTextureProxyImpl
     : public StreamTextureProxy,
@@ skipping 145 matching lines @@
   return new StreamTextureProxyImpl(context_provider_.get());
 }
 
 void StreamTextureFactorySynchronousImpl::EstablishPeer(int32_t stream_id,
                                                         int player_id,
                                                         int frame_id) {
   DCHECK(context_provider_.get());
   scoped_refptr<gfx::SurfaceTexture> surface_texture =
       context_provider_->GetSurfaceTexture(stream_id);
   if (surface_texture.get()) {
-    SurfaceTexturePeer::GetInstance()->EstablishSurfaceTexturePeer(
-        base::GetCurrentProcessHandle(),
-        surface_texture,
-        frame_id,
-        player_id);
+    gpu::SurfaceTexturePeer::GetInstance()->EstablishSurfaceTexturePeer(
+        base::GetCurrentProcessHandle(), surface_texture, frame_id, player_id);
   }
 }
 
 unsigned StreamTextureFactorySynchronousImpl::CreateStreamTexture(
     unsigned texture_target,
     unsigned* texture_id,
     gpu::Mailbox* texture_mailbox) {
   DCHECK(context_provider_.get());
   unsigned stream_id = 0;
   GLES2Interface* gl = context_provider_->ContextGL();
@@ skipping 25 matching lines @@
 
 void StreamTextureFactorySynchronousImpl::RemoveObserver(
     StreamTextureFactoryContextObserver* obs) {
   DCHECK(observers_.find(obs) != observers_.end());
   observers_.erase(obs);
   if (context_provider_.get())
     context_provider_->RemoveObserver(obs);
 }
 
 }  // namespace content