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 9cebe76f4c7145e3a5d7c66e2bf20a6c87cabfbb..b7aa18b139ca43181cefebb52c3a82a2a3ba65e7 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -69,6 +69,7 @@ class RenderWidgetFullscreenPepper;
 struct CustomContextMenuContext;
 
 #if defined(OS_ANDROID)
+class RendererCdmManager;
 class RendererMediaPlayerManager;
 #endif
 
@@ -529,11 +530,12 @@ class CONTENT_EXPORT RenderFrameImpl
       blink::WebMediaPlayerClient* client);
 
 #if defined(OS_ANDROID)
- blink::WebMediaPlayer* CreateAndroidWebMediaPlayer(
+  blink::WebMediaPlayer* CreateAndroidWebMediaPlayer(
       const blink::WebURL& url,
       blink::WebMediaPlayerClient* client);
 
- RendererMediaPlayerManager* GetMediaPlayerManager();
+  RendererMediaPlayerManager* GetMediaPlayerManager();
+  RendererCdmManager* GetCdmManager();
 #endif
 
   // Stores the WebLocalFrame we are associated with.
@@ -604,10 +606,11 @@ class CONTENT_EXPORT RenderFrameImpl
   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.
+  // Manages all media players and CDMs in this render frame for communicating

[ddorwin, 2014/05/23 23:28:37]

nit: These manage...

[xhwang, 2014/05/27 22:57:41]

Done.

+  // with the real media player and CDM objects in the browser process. It's
+  // okay to use raw pointers since they are RenderFrameObservers.
   RendererMediaPlayerManager* media_player_manager_;
+  RendererCdmManager* cdm_manager_;
 #endif
 
   base::WeakPtrFactory<RenderFrameImpl> weak_factory_;