Move WebMediaPlayerImpl and its dependencies to media/blink.

Moving WebMediaPlayerImpl and related classes in content/renderer/media to media/blink so that they can be reused by Mojo code.

BUG=408338

Review URL: https://codereview.chromium.org/495353003

Cr-Commit-Position: refs/heads/master@{#293628}

BUILD.gn

@@ -51,6 +51,7 @@ group("root") {
     "//ipc/mojo",
     "//jingle:notifier",
     "//media",
+    "//media/blink",
     "//media/cast",
     "//mojo",
     "//net",
@@ -194,6 +195,7 @@ group("root") {
       "//extensions/common",
       "//extensions/common/api",
       "//extensions/renderer",
+      "//media/blink",  # Blocked on blink
       "//pdf",  # Not compiled on Android in GYP yet, either.
       "//ppapi:ppapi_c",
       "//sandbox",

content/content_renderer.gypi

@@ -12,6 +12,7 @@
     '../gin/gin.gyp:gin',
     '../gpu/gpu.gyp:gpu',
     '../jingle/jingle.gyp:jingle_glue',
+    '../media/blink/media_blink.gyp:media_blink',
     '../media/media.gyp:media',
     '../mojo/mojo_base.gyp:mojo_application_bindings',
     '../mojo/mojo_base.gyp:mojo_environment_chromium',
@@ -209,8 +210,6 @@
       'renderer/java/gin_java_bridge_object.h',
       'renderer/java/gin_java_bridge_value_converter.cc',
       'renderer/java/gin_java_bridge_value_converter.h',
-      'renderer/media/active_loader.cc',
-      'renderer/media/active_loader.h',
       'renderer/media/aec_dump_message_filter.cc',
       'renderer/media/aec_dump_message_filter.h',
       'renderer/media/android/audio_decoder_android.cc',
@@ -240,20 +239,10 @@
       'renderer/media/audio_message_filter.h',
       'renderer/media/audio_renderer_mixer_manager.cc',
       'renderer/media/audio_renderer_mixer_manager.h',
-      'renderer/media/buffered_data_source.cc',
-      'renderer/media/buffered_data_source.h',
-      'renderer/media/buffered_data_source_host_impl.h',
-      'renderer/media/buffered_data_source_host_impl.cc',
-      'renderer/media/buffered_resource_loader.cc',
-      'renderer/media/buffered_resource_loader.h',
-      'renderer/media/cache_util.cc',
-      'renderer/media/cache_util.h',
       'renderer/media/cdm_session_adapter.cc',
       'renderer/media/cdm_session_adapter.h',
       'renderer/media/crypto/content_decryption_module_factory.cc',
       'renderer/media/crypto/content_decryption_module_factory.h',
-      'renderer/media/crypto/encrypted_media_player_support.cc',
-      'renderer/media/crypto/encrypted_media_player_support.h',
       'renderer/media/crypto/encrypted_media_player_support_impl.cc',
       'renderer/media/crypto/encrypted_media_player_support_impl.h',
       'renderer/media/crypto/key_systems.cc',
@@ -291,39 +280,20 @@
       'renderer/media/renderer_webaudiodevice_impl.h',
       'renderer/media/renderer_webmidiaccessor_impl.cc',
       'renderer/media/renderer_webmidiaccessor_impl.h',
-      'renderer/media/texttrack_impl.cc',
-      'renderer/media/texttrack_impl.h',
       'renderer/media/video_capture_impl.cc',
       'renderer/media/video_capture_impl.h',
       'renderer/media/video_capture_impl_manager.cc',
       'renderer/media/video_capture_impl_manager.h',
       'renderer/media/video_capture_message_filter.cc',
       'renderer/media/video_capture_message_filter.h',
-      'renderer/media/video_frame_compositor.cc',
-      'renderer/media/video_frame_compositor.h',
       'renderer/media/video_frame_provider.cc',
       'renderer/media/video_frame_provider.h',
-      'renderer/media/webaudiosourceprovider_impl.cc',
-      'renderer/media/webaudiosourceprovider_impl.h',
       'renderer/media/webcontentdecryptionmodule_impl.cc',
       'renderer/media/webcontentdecryptionmodule_impl.h',
       'renderer/media/webcontentdecryptionmodulesession_impl.cc',
       'renderer/media/webcontentdecryptionmodulesession_impl.h',
-      'renderer/media/webinbandtexttrack_impl.cc',
-      'renderer/media/webinbandtexttrack_impl.h',
-      'renderer/media/webmediaplayer_delegate.h',
-      'renderer/media/webmediaplayer_impl.cc',
-      'renderer/media/webmediaplayer_impl.h',
       'renderer/media/webmediaplayer_ms.cc',
       'renderer/media/webmediaplayer_ms.h',
-      'renderer/media/webmediaplayer_params.cc',
-      'renderer/media/webmediaplayer_params.h',
-      'renderer/media/webmediaplayer_util.cc',
-      'renderer/media/webmediaplayer_util.h',
-      'renderer/media/webmediasource_impl.cc',
-      'renderer/media/webmediasource_impl.h',
-      'renderer/media/websourcebuffer_impl.cc',
-      'renderer/media/websourcebuffer_impl.h',
       'renderer/memory_benchmarking_extension.cc',
       'renderer/memory_benchmarking_extension.h',
       'renderer/menu_item_builder.cc',

content/content_shell.gypi

@@ -50,6 +50,7 @@
         '../gin/gin.gyp:gin',
         '../gpu/gpu.gyp:gpu',
         '../ipc/ipc.gyp:ipc',
+        '../media/blink/media_blink.gyp:media_blink',
         '../media/media.gyp:media',
         '../net/net.gyp:net',
         '../net/net.gyp:net_resources',

content/content_tests.gypi

@@ -272,6 +272,7 @@
             '../cc/blink/cc_blink.gyp:cc_blink',
             '../cc/cc.gyp:cc',
             '../cc/cc_tests.gyp:cc_test_support',
+            '../media/blink/media_blink.gyp:media_blink',
             '../media/media.gyp:media',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
             '../ppapi/ppapi_internal.gyp:ppapi_proxy',
@@ -702,19 +703,11 @@
         'renderer/media/android/media_info_loader_unittest.cc',
         'renderer/media/audio_message_filter_unittest.cc',
         'renderer/media/audio_renderer_mixer_manager_unittest.cc',
-        'renderer/media/buffered_data_source_unittest.cc',
-        'renderer/media/buffered_data_source_host_impl_unittest.cc',
-        'renderer/media/buffered_resource_loader_unittest.cc',
-        'renderer/media/cache_util_unittest.cc',
         'renderer/media/crypto/key_systems_unittest.cc',
         'renderer/media/render_media_log_unittest.cc',
-        'renderer/media/test_response_generator.cc',
-        'renderer/media/test_response_generator.h',
         'renderer/media/video_capture_impl_manager_unittest.cc',
         'renderer/media/video_capture_impl_unittest.cc',
         'renderer/media/video_capture_message_filter_unittest.cc',
-        'renderer/media/video_frame_compositor_unittest.cc',
-        'renderer/media/webaudiosourceprovider_impl_unittest.cc',
         'renderer/media/webrtc/video_destination_handler_unittest.cc',
         'renderer/npapi/webplugin_impl_unittest.cc',
         'renderer/pepper/host_var_tracker_unittest.cc',

content/renderer/BUILD.gn

@@ -29,6 +29,7 @@ source_set("renderer") {
     "//gin",
     "//jingle:jingle_glue",
     "//media",
+    "//media/blink",
     "//mojo/bindings/js",
     "//mojo/environment:chromium",
     "//mojo/public/js/bindings",
@@ -71,7 +72,6 @@ source_set("renderer") {
     sources -= [
       "accessibility/renderer_accessibility_focus_only.cc",
       "media/audio_decoder.cc",
-      "media/webmediaplayer_impl.cc",
     ]
     sources += [
       "external_popup_menu.cc",

content/renderer/media/android/media_info_loader.cc

@@ -83,7 +83,7 @@ void MediaInfoLoader::Start(blink::WebFrame* frame) {
 
   // Start the resource loading.
   loader->loadAsynchronously(request, this);
-  active_loader_.reset(new ActiveLoader(loader.Pass()));
+  active_loader_.reset(new media::ActiveLoader(loader.Pass()));
 }
 
 /////////////////////////////////////////////////////////////////////////////

content/renderer/media/android/media_info_loader.h

@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
-#include "content/renderer/media/active_loader.h"
+#include "media/blink/active_loader.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
@@ -113,7 +113,7 @@ class CONTENT_EXPORT MediaInfoLoader : private blink::WebURLLoaderClient {
   scoped_ptr<blink::WebURLLoader> test_loader_;
 
   // Keeps track of an active WebURLLoader and associated state.
-  scoped_ptr<ActiveLoader> active_loader_;
+  scoped_ptr<media::ActiveLoader> active_loader_;
 
   bool loader_failed_;
   GURL url_;

content/renderer/media/android/media_source_delegate.cc

@@ -11,12 +11,12 @@
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/renderer/media/android/renderer_demuxer_android.h"
-#include "content/renderer/media/webmediaplayer_util.h"
-#include "content/renderer/media/webmediasource_impl.h"
 #include "media/base/android/demuxer_stream_player_params.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/media_log.h"
+#include "media/blink/webmediaplayer_util.h"
+#include "media/blink/webmediasource_impl.h"
 #include "media/filters/chunk_demuxer.h"
 #include "media/filters/decrypting_demuxer_stream.h"
 #include "third_party/WebKit/public/platform/WebString.h"
@@ -189,7 +189,7 @@ void MediaSourceDelegate::InitializeDemuxer() {
 }
 
 blink::WebTimeRanges MediaSourceDelegate::Buffered() const {
-  return ConvertToWebTimeRanges(buffered_time_ranges_);
+  return media::ConvertToWebTimeRanges(buffered_time_ranges_);
 }
 
 size_t MediaSourceDelegate::DecodedFrameCount() const {
@@ -662,15 +662,15 @@ base::TimeDelta MediaSourceDelegate::GetDuration() const {
   if (duration == std::numeric_limits<double>::infinity())
     return media::kInfiniteDuration();
 
-  return ConvertSecondsToTimestamp(duration);
+  return media::ConvertSecondsToTimestamp(duration);
 }
 
 void MediaSourceDelegate::OnDemuxerOpened() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   if (media_source_opened_cb_.is_null())
     return;
 
-  media_source_opened_cb_.Run(new WebMediaSourceImpl(
+  media_source_opened_cb_.Run(new media::WebMediaSourceImpl(
       chunk_demuxer_.get(), base::Bind(&LogMediaSourceError, media_log_)));
 }
 

content/renderer/media/android/webmediaplayer_android.cc

@@ -26,8 +26,6 @@
 #include "content/renderer/media/crypto/key_systems.h"
 #include "content/renderer/media/crypto/renderer_cdm_manager.h"
 #include "content/renderer/media/webcontentdecryptionmodule_impl.h"
-#include "content/renderer/media/webmediaplayer_delegate.h"
-#include "content/renderer/media/webmediaplayer_util.h"
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "gpu/GLES2/gl2extchromium.h"
@@ -40,6 +38,8 @@
 #include "media/base/media_log.h"
 #include "media/base/media_switches.h"
 #include "media/base/video_frame.h"
+#include "media/blink/webmediaplayer_delegate.h"
+#include "media/blink/webmediaplayer_util.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
@@ -111,7 +111,7 @@ namespace content {
 WebMediaPlayerAndroid::WebMediaPlayerAndroid(
     blink::WebFrame* frame,
     blink::WebMediaPlayerClient* client,
-    base::WeakPtr<WebMediaPlayerDelegate> delegate,
+    base::WeakPtr<media::WebMediaPlayerDelegate> delegate,
     RendererMediaPlayerManager* player_manager,
     RendererCdmManager* cdm_manager,
     scoped_refptr<StreamTextureFactory> factory,
@@ -200,7 +200,7 @@ void WebMediaPlayerAndroid::load(LoadType load_type,
                                  const blink::WebURL& url,
                                  CORSMode cors_mode) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
-  ReportMediaSchemeUma(GURL(url));
+  media::ReportMediaSchemeUma(GURL(url));
 
   switch (load_type) {
     case LoadTypeURL:
@@ -331,7 +331,7 @@ void WebMediaPlayerAndroid::seek(double seconds) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   DVLOG(1) << __FUNCTION__ << "(" << seconds << ")";
 
-  base::TimeDelta new_seek_time = ConvertSecondsToTimestamp(seconds);
+  base::TimeDelta new_seek_time = media::ConvertSecondsToTimestamp(seconds);
 
   if (seeking_) {
     if (new_seek_time == seek_time_) {
@@ -672,7 +672,7 @@ bool WebMediaPlayerAndroid::didPassCORSAccessCheck() const {
 }
 
 double WebMediaPlayerAndroid::mediaTimeForTimeValue(double timeValue) const {
-  return ConvertSecondsToTimestamp(timeValue).InSecondsF();
+  return media::ConvertSecondsToTimestamp(timeValue).InSecondsF();
 }
 
 unsigned WebMediaPlayerAndroid::decodedFrameCount() const {

content/renderer/media/android/webmediaplayer_android.h

@@ -56,13 +56,13 @@ struct MailboxHolder;
 
 namespace media {
 class MediaLog;
+class WebMediaPlayerDelegate;
 }
 
 namespace content {
 class RendererCdmManager;
 class RendererMediaPlayerManager;
 class WebContentDecryptionModuleImpl;
-class WebMediaPlayerDelegate;
 
 // This class implements blink::WebMediaPlayer by keeping the android
 // media player in the browser process. It listens to all the status changes
@@ -81,7 +81,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
   WebMediaPlayerAndroid(
       blink::WebFrame* frame,
       blink::WebMediaPlayerClient* client,
-      base::WeakPtr<WebMediaPlayerDelegate> delegate,
+      base::WeakPtr<media::WebMediaPlayerDelegate> delegate,
       RendererMediaPlayerManager* player_manager,
       RendererCdmManager* cdm_manager,
       scoped_refptr<StreamTextureFactory> factory,
@@ -331,7 +331,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
   // TODO(qinmin): Currently android mediaplayer takes care of the screen
   // lock. So this is only used for media source. Will apply this to regular
   // media tag once http://crbug.com/247892 is fixed.
-  base::WeakPtr<WebMediaPlayerDelegate> delegate_;
+  base::WeakPtr<media::WebMediaPlayerDelegate> delegate_;
 
   // Save the list of buffered time ranges.
   blink::WebTimeRanges buffered_;

content/renderer/media/crypto/encrypted_media_player_support_impl.cc

@@ -16,6 +16,7 @@
 #include "content/renderer/media/webcontentdecryptionmodule_impl.h"
 #include "content/renderer/pepper/pepper_webplugin_impl.h"
 #include "media/base/bind_to_current_loop.h"
+#include "media/blink/encrypted_media_player_support.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
@@ -123,8 +124,8 @@ static std::string GuessInitDataType(const unsigned char* init_data,
   return "video/mp4";
 }
 
-scoped_ptr<EncryptedMediaPlayerSupport> EncryptedMediaPlayerSupportImpl::Create(
-    blink::WebMediaPlayerClient* client) {
+scoped_ptr<media::EncryptedMediaPlayerSupport>
+EncryptedMediaPlayerSupportImpl::Create(blink::WebMediaPlayerClient* client) {
   return scoped_ptr<EncryptedMediaPlayerSupport>(
       new EncryptedMediaPlayerSupportImpl(client));
 }

content/renderer/media/crypto/encrypted_media_player_support_impl.h

@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
-#include "content/renderer/media/crypto/encrypted_media_player_support.h"
 #include "content/renderer/media/crypto/proxy_decryptor.h"
+#include "media/blink/encrypted_media_player_support.h"
 
 namespace blink {
 class WebMediaPlayerClient;
@@ -21,7 +21,7 @@ namespace content {
 class WebContentDecryptionModuleImpl;
 
 class EncryptedMediaPlayerSupportImpl
-    : public EncryptedMediaPlayerSupport,
+    : public media::EncryptedMediaPlayerSupport,
       public base::SupportsWeakPtr<EncryptedMediaPlayerSupportImpl> {
  public:
   static scoped_ptr<EncryptedMediaPlayerSupport> Create(

content/renderer/media/webmediaplayer_ms.cc

@@ -16,13 +16,13 @@
 #include "content/renderer/media/media_stream_audio_renderer.h"
 #include "content/renderer/media/media_stream_renderer_factory.h"
 #include "content/renderer/media/video_frame_provider.h"
-#include "content/renderer/media/webmediaplayer_delegate.h"
-#include "content/renderer/media/webmediaplayer_util.h"
 #include "content/renderer/render_frame_impl.h"
 #include "media/base/media_log.h"
 #include "media/base/video_frame.h"
 #include "media/base/video_rotation.h"
 #include "media/base/video_util.h"
+#include "media/blink/webmediaplayer_delegate.h"
+#include "media/blink/webmediaplayer_util.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
@@ -81,7 +81,7 @@ namespace content {
 WebMediaPlayerMS::WebMediaPlayerMS(
     blink::WebFrame* frame,
     blink::WebMediaPlayerClient* client,
-    base::WeakPtr<WebMediaPlayerDelegate> delegate,
+    base::WeakPtr<media::WebMediaPlayerDelegate> delegate,
     media::MediaLog* media_log,
     scoped_ptr<MediaStreamRendererFactory> factory)
     : frame_(frame),
@@ -358,7 +358,7 @@ bool WebMediaPlayerMS::didPassCORSAccessCheck() const {
 }
 
 double WebMediaPlayerMS::mediaTimeForTimeValue(double timeValue) const {
-  return ConvertSecondsToTimestamp(timeValue).InSecondsF();
+  return media::ConvertSecondsToTimestamp(timeValue).InSecondsF();
 }
 
 unsigned WebMediaPlayerMS::decodedFrameCount() const {