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

chrome/renderer/chrome_content_renderer_client.cc

Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index f1e19dc4cd8d6a8ad5541f963b01c2738aba108d..5837852292ce18ab51d4b2dc3248313eb898d4a3 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -463,22 +463,23 @@ WebPlugin* ChromeContentRendererClient::CreatePluginReplacement(
   return placeholder->plugin();
 }
 
-webkit_media::WebMediaPlayerImpl*
-ChromeContentRendererClient::OverrideCreateWebMediaPlayer(
+void ChromeContentRendererClient::DeferMediaLoad(
     content::RenderView* render_view,
-    WebKit::WebFrame* frame,
-    WebKit::WebMediaPlayerClient* client,
-    base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
-    const webkit_media::WebMediaPlayerParams& params) {
+    const base::Closure& closure) {
 #if defined(OS_ANDROID)
   // Chromium for Android doesn't support prerender yet.
-  return NULL;
+  closure.Run();
+  return;
 #else
-  if (!prerender::PrerenderHelper::IsPrerendering(render_view))
-    return NULL;
+  if (!prerender::PrerenderHelper::IsPrerendering(render_view)) {
+    closure.Run();
+    return;
+  }
 
-  return new prerender::PrerenderWebMediaPlayer(
-      render_view, frame, client, delegate, params);
+  // Lifetime of |prerender_player| is managed by content::RenderViewObserver.
+  prerender::PrerenderWebMediaPlayer* prerender_player =
+      new prerender::PrerenderWebMediaPlayer(render_view);
+  prerender_player->DeferLoad(closure);

[jam, 2013/07/02 15:18:34]

it seems unnecessary to have DeferLoad, why not just pass it in as a parameter
to the constructor? then you can simply have

new prerender::PrerenderWebMediaPlayer(render_view, closure);

[scherkus (not reviewing), 2013/07/02 18:36:19]

Doh. Right. Good call!

 #endif
 }