Make RendererMediaPlayerManager a RenderFrameObserver.

content/renderer/render_frame_impl.h

Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index e0a49144928b34cf7bac0e505148eb4e938a01f7..4d58f9fef72ef553931055dcb1d4a4ad37e36e27 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -25,6 +25,10 @@
 #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
 #include "ui/gfx/range/range.h"
 
+#if defined(OS_ANDROID)
+#include "content/renderer/media/android/renderer_media_player_manager.h"
+#endif
+
 class TransportDIB;
 struct FrameMsg_BuffersSwapped_Params;
 struct FrameMsg_CompositorFrameSwapped_Params;
@@ -63,6 +67,10 @@ class RenderWidget;
 class RenderWidgetFullscreenPepper;
 struct CustomContextMenuContext;
 
+#if defined(OS_ANDROID)
+class RendererMediaPlayerManager;
+#endif
+
 class CONTENT_EXPORT RenderFrameImpl
     : public RenderFrame,
       NON_EXPORTED_BASE(public blink::WebFrameClient),
@@ -498,6 +506,8 @@ class CONTENT_EXPORT RenderFrameImpl
  blink::WebMediaPlayer* CreateAndroidWebMediaPlayer(
       const blink::WebURL& url,
       blink::WebMediaPlayerClient* client);
+
+ RendererMediaPlayerManager* GetMediaPlayerManager();
 #endif
 
   // Stores the WebLocalFrame we are associated with.
@@ -563,6 +573,13 @@ class CONTENT_EXPORT RenderFrameImpl
   MediaStreamClient* media_stream_client_;
   blink::WebUserMediaClient* web_user_media_client_;
 
+#if defined(OS_ANDROID)
+  // Manages all media players in this render frame for communicating with the
+  // real media player and CDM objects in the browser process. It's okay to use
+  // raw pointers since it's a RenderFrameObserver.
+  RendererMediaPlayerManager* media_player_manager_;
+#endif
+
   base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);