Separate RendererCdmManager from RendererMediaPlayerManager.

content/renderer/render_frame_impl.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 51 matching lines @@
 class NotificationProvider;
 class PepperPluginInstanceImpl;
 class RendererPpapiHost;
 class RenderFrameObserver;
 class RenderViewImpl;
 class RenderWidget;
 class RenderWidgetFullscreenPepper;
 struct CustomContextMenuContext;
 
 #if defined(OS_ANDROID)
+class RendererCdmManager;
 class RendererMediaPlayerManager;
 #endif
 
 class CONTENT_EXPORT RenderFrameImpl
     : public RenderFrame,
       NON_EXPORTED_BASE(public blink::WebFrameClient),
       NON_EXPORTED_BASE(public WebMediaPlayerDelegate) {
  public:
   // Creates a new RenderFrame. |render_view| is the RenderView object that this
   // frame belongs to.
@@ skipping 440 matching lines @@
   // Initializes |media_stream_client_|, returning true if successful. Returns
   // false if it wasn't possible to create a MediaStreamClient (e.g., WebRTC is
   // disabled) in which case |media_stream_client_| is NULL.
   bool InitializeMediaStreamClient();
 
   blink::WebMediaPlayer* CreateWebMediaPlayerForMediaStream(
       const blink::WebURL& url,
       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.
   blink::WebLocalFrame* frame_;
 
   base::WeakPtr<RenderViewImpl> render_view_;
   int routing_id_;
   bool is_swapped_out_;
   // RenderFrameProxy exists only when is_swapped_out_ is true.
   // TODO(nasko): This can be removed once we don't have a swapped out state on
@@ skipping 50 matching lines @@
   // references.
 
   // Holds a reference to the service which provides desktop notifications.
   NotificationProvider* notification_provider_;
 
   // MediaStreamClient attached to this frame; lazily initialized.
   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.
+  // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_