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 b2ec010460ce5fbca4d51e07a5634d8c66aba3e8..5f08a7aec789e46304995027992109333bd7bad5 100644
--- a/webkit/renderer/media/webmediaplayer_impl.h
+++ b/webkit/renderer/media/webmediaplayer_impl.h
@@ -65,7 +65,7 @@ class WebLayerImpl;
 namespace webkit_media {
 
 class BufferedDataSource;
-class MediaStreamClient;
+class MediaLoadDelegate;
 class WebAudioSourceProviderImpl;
 class WebMediaPlayerDelegate;
 class WebMediaPlayerParams;
@@ -205,8 +205,11 @@ class WebMediaPlayerImpl
   void SetOpaque(bool);
 
  private:
-  // Contains common logic used across the different types loading.
-  void LoadSetup(const WebKit::WebURL& url);
+  // Called after |load_delegate_| has decided to allow the load. If
+  // |load_delegate_| is NULL this is called immediately.
+  void ContinueLoad(const WebKit::WebURL& url,

[ddorwin, 2013/06/29 01:38:30]

nit: "Continue" implies there was a previous step. "Perform" (aka Do)?

[scherkus (not reviewing), 2013/07/02 01:46:23]

Done.

+                    WebKit::WebMediaSource* media_source,
+                    CORSMode cors_mode);
 
   // Called after asynchronous initialization of a data source completed.
   void DataSourceInitialized(const GURL& gurl, bool success);
@@ -305,7 +308,7 @@ class WebMediaPlayerImpl
 
   base::WeakPtr<WebMediaPlayerDelegate> delegate_;
 
-  MediaStreamClient* media_stream_client_;
+  MediaLoadDelegate* load_delegate_;
 
   scoped_refptr<media::MediaLog> media_log_;