Migrate webkit/renderer/media/ to content/renderer/media/.

content/public/renderer/content_renderer_client.h

Index: content/public/renderer/content_renderer_client.h
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
index 073d0af28f6cd4087403575e2895d5fa80afe95b..111aa31a0c9b33f4b4e2779413d194284a9a919b 100644
--- a/content/public/renderer/content_renderer_client.h
+++ b/content/public/renderer/content_renderer_client.h
@@ -31,7 +31,6 @@ class WebFrame;
 class WebHyphenator;
 class WebMIDIAccessor;
 class WebMIDIAccessorClient;
-class WebMediaPlayerClient;
 class WebMediaStreamCenter;
 class WebMediaStreamCenterClient;
 class WebPlugin;
@@ -54,14 +53,10 @@ class PpapiInterfaceFactoryManager;
 struct WebPluginInfo;
 }
 
-namespace webkit_media {
-class WebMediaPlayerDelegate;
-class WebMediaPlayerImpl;
-class WebMediaPlayerParams;
-}
-
 namespace content {
 
+class MediaPlayerLoadDelegate;
+class MediaStreamClient;
 class RenderView;
 class SynchronousCompositor;
 
@@ -126,14 +121,11 @@ class CONTENT_EXPORT ContentRendererClient {
       std::string* error_html,
       string16* error_description) {}
 
-  // Allows embedder to override creating a WebMediaPlayerImpl. If it returns
-  // NULL the content layer will create the media player.
-  virtual webkit_media::WebMediaPlayerImpl* OverrideCreateWebMediaPlayer(
-      RenderView* render_view,
-      WebKit::WebFrame* frame,
-      WebKit::WebMediaPlayerClient* client,
-      base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
-      const webkit_media::WebMediaPlayerParams& params);
+  // Allows the embedder to control when media resources are loaded. If it
+  // returns NULL no delegate will be used and media resources will always
+  // be loaded.
+  virtual MediaPlayerLoadDelegate* OverrideCreateMediaPlayerLoadDelegate(

[scherkus (not reviewing), 2013/06/28 06:04:41]

I'm not a content API pro by any means ... but this seems a bit strange that
every other method deals with WebKit:: interfaces yet I'm introducing two
content:: interface overrides here.

Am I Doing It Wrong(tm) or is this an OK place to put these methods? Is there a
better location for overriding content-ish objects as opposed to WebKit-ish
objects?

+      RenderView* render_view);
 
   // Allows the embedder to override creating a WebMediaStreamCenter. If it
   // returns NULL the content layer will create the stream center.
@@ -146,6 +138,10 @@ class CONTENT_EXPORT ContentRendererClient {
   OverrideCreateWebRTCPeerConnectionHandler(
       WebKit::WebRTCPeerConnectionHandlerClient* client);
 
+  // Allows the embedder to override creating a MediaStreamClient. If it returns
+  // NULL the content layer will create the media stream client.
+  virtual MediaStreamClient* OverrideCreateMediaStreamClient();
+
   // Allows the embedder to override creating a WebMIDIAccessor.  If it
   // returns NULL the content layer will create the MIDI accessor.
   virtual WebKit::WebMIDIAccessor* OverrideCreateMIDIAccessor(