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

chrome/renderer/prerender/prerender_webmediaplayer.h

Index: chrome/renderer/prerender/prerender_webmediaplayer.h
diff --git a/chrome/renderer/prerender/prerender_webmediaplayer.h b/chrome/renderer/prerender/prerender_webmediaplayer.h
index da0b4d39c66e62f9cd29532a93320dde6cab6887..70587b874f14b3ff7f6d3882ffc64a1852e2330c 100644
--- a/chrome/renderer/prerender/prerender_webmediaplayer.h
+++ b/chrome/renderer/prerender/prerender_webmediaplayer.h
@@ -5,32 +5,22 @@
 #ifndef CHROME_RENDERER_PRERENDER_PRERENDER_WEBMEDIAPLAYER_H_
 #define CHROME_RENDERER_PRERENDER_PRERENDER_WEBMEDIAPLAYER_H_
 
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
+#include "base/callback.h"
+#include "content/public/renderer/media_player_load_delegate.h"
 #include "content/public/renderer/render_view_observer.h"
-#include "webkit/renderer/media/webmediaplayer_impl.h"
 
 namespace prerender {
 
-// Substitute for WebMediaPlayerImpl to be used in prerendered pages. Defers
-// the loading of the media till the prerendered page is swapped in.
-class PrerenderWebMediaPlayer
-    : public content::RenderViewObserver,
-      public webkit_media::WebMediaPlayerImpl {
+// Defers media player loading in prerendered pages until the prerendered page
+// is swapped in.
+class PrerenderWebMediaPlayer : public content::RenderViewObserver,

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

FYI I'm happy to rename this after we agree on the correct approach and name for
MPLD

given it's in a prerender namespace it could even be MPLDImpl, especially
considering there are no other impls

+                                public content::MediaPlayerLoadDelegate {
  public:
-  PrerenderWebMediaPlayer(
-      content::RenderView* render_view,
-      WebKit::WebFrame* frame,
-      WebKit::WebMediaPlayerClient* client,
-      base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
-      const webkit_media::WebMediaPlayerParams& params);
+  explicit PrerenderWebMediaPlayer(content::RenderView* render_view);
   virtual ~PrerenderWebMediaPlayer();
 
-  // WebMediaPlayerImpl methods:
-  virtual void load(const WebKit::WebURL& url, CORSMode cors_mode) OVERRIDE;
-  virtual void load(const WebKit::WebURL& url,
-                    WebKit::WebMediaSource* media_source,
-                    CORSMode cors_mode) OVERRIDE;
+  // content::MediaPlayerLoadDelegate implementation.
+  virtual void DeferLoad(const base::Closure& closure) OVERRIDE;
 
  private:
   // RenderViewObserver method:
@@ -39,10 +29,7 @@ class PrerenderWebMediaPlayer
   void OnSetIsPrerendering(bool is_prerendering);
 
   bool is_prerendering_;
-  bool url_loaded_;
-  scoped_ptr<WebKit::WebURL> url_to_load_;
-  scoped_ptr<WebKit::WebMediaSource> media_source_to_load_;
-  CORSMode cors_mode_;
+  base::Closure continue_loading_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderWebMediaPlayer);
 };