Separate RendererCdmManager from RendererMediaPlayerManager.

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..6586b52d8bfee51fa7029db4a0eba9f87faccbf9 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_cdm_manager.h"
+#endif
+
 class TransportDIB;
 struct FrameMsg_BuffersSwapped_Params;
 struct FrameMsg_CompositorFrameSwapped_Params;
@@ -498,6 +502,8 @@ class CONTENT_EXPORT RenderFrameImpl
  blink::WebMediaPlayer* CreateAndroidWebMediaPlayer(
       const blink::WebURL& url,
       blink::WebMediaPlayerClient* client);
+
+ RendererCdmManager* GetCdmManager();
 #endif
 
   // Stores the WebLocalFrame we are associated with.
@@ -563,6 +569,13 @@ class CONTENT_EXPORT RenderFrameImpl
   MediaStreamClient* media_stream_client_;
   blink::WebUserMediaClient* web_user_media_client_;
 
+#if defined(OS_ANDROID)
+  // The CDM manager for managing all the CDMs in this frame for communicating
+  // with the real CDM objects in browser process. It's okay to use a raw
+  // pointer since it's a RenderFrameObserver.
+  RendererCdmManager* cdm_manager_;
+#endif
+
   base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);