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

content/public/renderer/content_renderer_client.cc

Index: content/public/renderer/content_renderer_client.cc
diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc
index e80ba37804ab9ed377b9a6d746dd25fc386ecf42..13998ac995712bf83d30b3d3b6e5922d94ef67c3 100644
--- a/content/public/renderer/content_renderer_client.cc
+++ b/content/public/renderer/content_renderer_client.cc
@@ -37,14 +37,9 @@ bool ContentRendererClient::HasErrorPage(int http_status_code,
   return false;
 }
 
-webkit_media::WebMediaPlayerImpl*
-ContentRendererClient::OverrideCreateWebMediaPlayer(
-    RenderView* render_view,
-    WebKit::WebFrame* frame,
-    WebKit::WebMediaPlayerClient* client,
-    base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
-    const webkit_media::WebMediaPlayerParams& params) {
-  return NULL;
+void ContentRendererClient::DeferMediaLoad(RenderView* render_view,
+                                           const base::Closure& closure) {
+  closure.Run();
 }
 
 WebKit::WebMediaStreamCenter*
@@ -59,6 +54,11 @@ ContentRendererClient::OverrideCreateWebRTCPeerConnectionHandler(
   return NULL;
 }
 
+webkit_media::MediaStreamClient*
+ContentRendererClient::OverrideCreateMediaStreamClient() {
+  return NULL;
+}
+
 WebKit::WebMIDIAccessor*
 ContentRendererClient::OverrideCreateMIDIAccessor(
     WebKit::WebMIDIAccessorClient* client) {