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

webkit/renderer/media/webmediaplayer_impl.h

Index: webkit/renderer/media/webmediaplayer_impl.h
diff --git a/webkit/renderer/media/webmediaplayer_impl.h b/webkit/renderer/media/webmediaplayer_impl.h
index 804866f6da9d9ba088c37dd33725dfe67acafe2c..a691c4d8edfd8312aabc640fcf87d89785744b31 100644
--- a/webkit/renderer/media/webmediaplayer_impl.h
+++ b/webkit/renderer/media/webmediaplayer_impl.h
@@ -67,7 +67,6 @@ class WebLayerImpl;
 namespace webkit_media {
 
 class BufferedDataSource;
-class MediaStreamClient;
 class WebAudioSourceProviderImpl;
 class WebMediaPlayerDelegate;
 class WebMediaPlayerParams;
@@ -207,8 +206,11 @@ class WebMediaPlayerImpl
   void SetOpaque(bool);
 
  private:
-  // Contains common logic used across the different types loading.
-  void LoadSetup(const WebKit::WebURL& url);
+  // Called after |defer_load_cb_| has decided to allow the load. If
+  // |defer_load_cb_| is null this is called immediately.
+  void DoLoad(const WebKit::WebURL& url,
+              WebKit::WebMediaSource* media_source,
+              CORSMode cors_mode);
 
   // Called after asynchronous initialization of a data source completed.
   void DataSourceInitialized(const GURL& gurl, bool success);
@@ -307,7 +309,7 @@ class WebMediaPlayerImpl
 
   base::WeakPtr<WebMediaPlayerDelegate> delegate_;
 
-  MediaStreamClient* media_stream_client_;
+  base::Callback<void(const base::Closure&)> defer_load_cb_;
 
   scoped_refptr<media::MediaLog> media_log_;