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

content/renderer/media/webmediaplayer_impl.h

Index: content/renderer/media/webmediaplayer_impl.h
diff --git a/webkit/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h
similarity index 94%
rename from webkit/renderer/media/webmediaplayer_impl.h
rename to content/renderer/media/webmediaplayer_impl.h
index b2ec010460ce5fbca4d51e07a5634d8c66aba3e8..91f28daad308eb7ebaea0f237cff598089369f63 100644
--- a/webkit/renderer/media/webmediaplayer_impl.h
+++ b/content/renderer/media/webmediaplayer_impl.h
@@ -17,8 +17,8 @@
 // at destruction of this class we will need to unhook it from destruction event
 // list of the main thread.
 
-#ifndef WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
-#define WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
+#ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
+#define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 
 #include <string>
 
@@ -27,6 +27,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
 #include "cc/layers/video_frame_provider.h"
+#include "content/common/content_export.h"
 #include "googleurl/src/gurl.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/decryptor.h"
@@ -62,16 +63,19 @@ namespace webkit {
 class WebLayerImpl;
 }
 
-namespace webkit_media {
-
+namespace content {
 class BufferedDataSource;
+class MediaPlayerLoadDelegate;
 class MediaStreamClient;
 class WebAudioSourceProviderImpl;
+class WebTextTrackImpl;
+}
+
+namespace content {
 class WebMediaPlayerDelegate;
 class WebMediaPlayerParams;
-class WebTextTrackImpl;
 
-class WebMediaPlayerImpl
+class CONTENT_EXPORT WebMediaPlayerImpl
     : public WebKit::WebMediaPlayer,
       public cc::VideoFrameProvider,
       public base::MessageLoop::DestructionObserver,
@@ -205,8 +209,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,
+                    WebKit::WebMediaSource* media_source,
+                    CORSMode cors_mode);
 
   // Called after asynchronous initialization of a data source completed.
   void DataSourceInitialized(const GURL& gurl, bool success);
@@ -303,9 +310,9 @@ class WebMediaPlayerImpl
 
   WebKit::WebMediaPlayerClient* client_;
 
-  base::WeakPtr<WebMediaPlayerDelegate> delegate_;
+  MediaPlayerLoadDelegate* load_delegate_;
 
-  MediaStreamClient* media_stream_client_;
+  base::WeakPtr<WebMediaPlayerDelegate> delegate_;
 
   scoped_refptr<media::MediaLog> media_log_;
 
@@ -325,7 +332,7 @@ class WebMediaPlayerImpl
   bool supports_save_;
 
   // The decryptor that manages decryption keys and decrypts encrypted frames.
-  scoped_ptr<ProxyDecryptor> decryptor_;
+  scoped_ptr<webkit_media::ProxyDecryptor> decryptor_;
 
   bool starting_;
 
@@ -368,6 +375,6 @@ class WebMediaPlayerImpl
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
-}  // namespace webkit_media
+}  // namespace content
 
-#endif  // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
+#endif  // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_