Make RendererMediaPlayerManager a RenderFrameObserver.

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"
@@ skipping 118 matching lines @@
   if (client_)
     client_->DidReceiveFrame();
 }
 
 }  // namespace
 
 // static
 scoped_refptr<StreamTextureFactorySynchronousImpl>
 StreamTextureFactorySynchronousImpl::Create(
     const CreateContextProviderCallback& try_create_callback,
-    int view_id) {
-  return new StreamTextureFactorySynchronousImpl(try_create_callback, view_id);
+    int frame_id) {
+  return new StreamTextureFactorySynchronousImpl(try_create_callback, frame_id);
 }
 
 StreamTextureFactorySynchronousImpl::StreamTextureFactorySynchronousImpl(
     const CreateContextProviderCallback& try_create_callback,
-    int view_id)
+    int frame_id)
     : create_context_provider_callback_(try_create_callback),
       context_provider_(create_context_provider_callback_.Run()),
-      view_id_(view_id) {}
+      frame_id_(frame_id) {}
 
 StreamTextureFactorySynchronousImpl::~StreamTextureFactorySynchronousImpl() {}
 
 StreamTextureProxy* StreamTextureFactorySynchronousImpl::CreateProxy() {
   if (!context_provider_)
     context_provider_ = create_context_provider_callback_.Run();
 
   if (!context_provider_)
     return NULL;
   return new StreamTextureProxyImpl(context_provider_);
 }
 
 void StreamTextureFactorySynchronousImpl::EstablishPeer(int32 stream_id,
                                                         int player_id) {
   DCHECK(context_provider_);
   scoped_refptr<gfx::SurfaceTexture> surface_texture =
       context_provider_->GetSurfaceTexture(stream_id);
   if (surface_texture) {
     SurfaceTexturePeer::GetInstance()->EstablishSurfaceTexturePeer(
         base::Process::Current().handle(),
         surface_texture,
-        view_id_,
+        frame_id_,
         player_id);
   }
 }
 
 unsigned StreamTextureFactorySynchronousImpl::CreateStreamTexture(
     unsigned texture_target,
     unsigned* texture_id,
     gpu::Mailbox* texture_mailbox) {
   DCHECK(context_provider_);
   unsigned stream_id = 0;
@@ skipping 10 matching lines @@
 void StreamTextureFactorySynchronousImpl::SetStreamTextureSize(
     int32 stream_id,
     const gfx::Size& size) {}
 
 gpu::gles2::GLES2Interface* StreamTextureFactorySynchronousImpl::ContextGL() {
   DCHECK(context_provider_);
   return context_provider_->ContextGL();
 }
 
 }  // namespace content