Make RendererMediaPlayerManager a RenderFrameObserver.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 2141f47944ee52b0a6335879a24630103e78ca7f..32aa4a32ce949e3969ca03974663967295563c36 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -119,6 +119,7 @@
 
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/renderer/android/synchronous_compositor_factory.h"
+#include "content/renderer/media/android/renderer_media_player_manager.h"
 #include "content/renderer/media/android/stream_texture_factory_impl.h"
 #include "content/renderer/media/android/webmediaplayer_android.h"
 #endif
@@ -363,6 +364,9 @@ RenderFrameImpl::RenderFrameImpl(RenderViewImpl* render_view, int routing_id)
       notification_provider_(NULL),
       media_stream_client_(NULL),
       web_user_media_client_(NULL),
+#if defined(OS_ANDROID)
+      media_player_manager_(NULL),
+#endif
       weak_factory_(this) {
   RenderThread::Get()->AddRoute(routing_id_, this);
 
@@ -3391,12 +3395,18 @@ WebMediaPlayer* RenderFrameImpl::CreateAndroidWebMediaPlayer(
       frame_,
       client,
       weak_factory_.GetWeakPtr(),
-      render_view_->media_player_manager_,
+      GetMediaPlayerManager(),
       stream_texture_factory,
       RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(),
       new RenderMediaLog());
 }
 
-#endif
+RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() {
+  if (!media_player_manager_)
+    media_player_manager_ = new RendererMediaPlayerManager(this);
+  return media_player_manager_;
+}
+
+#endif  // defined(OS_ANDROID)
 
 }  // namespace content