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

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/renderer/chrome_content_renderer_client.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
@@ skipping 445 matching lines @@
 }
 
 WebPlugin* ChromeContentRendererClient::CreatePluginReplacement(
     content::RenderView* render_view,
     const base::FilePath& plugin_path) {
   PluginPlaceholder* placeholder =
       PluginPlaceholder::CreateErrorPlugin(render_view, plugin_path);
   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
 }
 
 WebPlugin* ChromeContentRendererClient::CreatePlugin(
     content::RenderView* render_view,
     WebFrame* frame,
     const WebPluginParams& original_params,
     const ChromeViewHostMsg_GetPluginInfo_Output& output) {
   const ChromeViewHostMsg_GetPluginInfo_Status& status = output.status;
   const WebPluginInfo& plugin = output.plugin;
@@ skipping 787 matching lines @@
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnablePepperTesting)) {
     return true;
   }
 #endif  // !defined(OS_ANDROID)
   return false;
 }
 
 
 }  // namespace chrome