Revert 277425 "Support casting for embedded YT videos"

Broke buildbots because it wasn't tried.

> Support casting for embedded YT videos
> 
> This is part 1 of the code to start supporting embedded YT for cast. The main
> issue is that YT embedded videos need to be identified via the frame that
> contains it. This CL sets the frame URL of each video in the MediaPlayerAndroid
> object.
> 
> NOTRY=true
> 
> Clank downstream piece to come later. 
> Min / Aaron: will send you the doc I have that explains this in more detail.
> 
> BUG=358573
> 
> Review URL: https://codereview.chromium.org/302453012

TBR=maybelle@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277430 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 9 insertions, 23 deletions

diff --git a/media/base/android/media_player_android.cc b/media/base/android/media_player_android.cc
index dc6e075..3501dcb 100644
--- a/media/base/android/media_player_android.cc
+++ b/media/base/android/media_player_android.cc
@@ -14,13 +14,11 @@ MediaPlayerAndroid::MediaPlayerAndroid(
     int player_id,
     MediaPlayerManager* manager,
     const RequestMediaResourcesCB& request_media_resources_cb,
-    const ReleaseMediaResourcesCB& release_media_resources_cb,
-    const GURL& frame_url)
+    const ReleaseMediaResourcesCB& release_media_resources_cb)
     : request_media_resources_cb_(request_media_resources_cb),
       release_media_resources_cb_(release_media_resources_cb),
       player_id_(player_id),
-      manager_(manager),
-      frame_url_(frame_url) {
+      manager_(manager) {
 }
 
 MediaPlayerAndroid::~MediaPlayerAndroid() {}
diff --git a/media/base/android/media_player_android.h b/media/base/android/media_player_android.h
index 879ba75..7a7a471 100644
--- a/media/base/android/media_player_android.h
+++ b/media/base/android/media_player_android.h
@@ -81,14 +81,11 @@ class MEDIA_EXPORT MediaPlayerAndroid {
 
   int player_id() { return player_id_; }
 
-  GURL frame_url() { return frame_url_; }
-
  protected:
   MediaPlayerAndroid(int player_id,
                      MediaPlayerManager* manager,
                      const RequestMediaResourcesCB& request_media_resources_cb,
-                     const ReleaseMediaResourcesCB& release_media_resources_cb,
-                     const GURL& frame_url);
+                     const ReleaseMediaResourcesCB& release_media_resources_cb);
 
   MediaPlayerManager* manager() { return manager_; }
 
@@ -103,9 +100,6 @@ class MEDIA_EXPORT MediaPlayerAndroid {
   // Resource manager for all the media players.
   MediaPlayerManager* manager_;
 
-  // Url for the frame that contains this player.
-  GURL frame_url_;
-
   DISALLOW_COPY_AND_ASSIGN(MediaPlayerAndroid);
 };
 
diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc
index 214b52b..174aaf9 100644
--- a/media/base/android/media_player_bridge.cc
+++ b/media/base/android/media_player_bridge.cc
@@ -33,13 +33,11 @@ MediaPlayerBridge::MediaPlayerBridge(
     bool hide_url_log,
     MediaPlayerManager* manager,
     const RequestMediaResourcesCB& request_media_resources_cb,
-    const ReleaseMediaResourcesCB& release_media_resources_cb,
-    const GURL& frame_url)
+    const ReleaseMediaResourcesCB& release_media_resources_cb)
     : MediaPlayerAndroid(player_id,
                          manager,
                          request_media_resources_cb,
-                         release_media_resources_cb,
-                         frame_url),
+                         release_media_resources_cb),
       prepared_(false),
       pending_play_(false),
       url_(url),
diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h
index f63d626..33ee118 100644
--- a/media/base/android/media_player_bridge.h
+++ b/media/base/android/media_player_bridge.h
@@ -49,8 +49,7 @@ class MEDIA_EXPORT MediaPlayerBridge : public MediaPlayerAndroid {
                     bool hide_url_log,
                     MediaPlayerManager* manager,
                     const RequestMediaResourcesCB& request_media_resources_cb,
-                    const ReleaseMediaResourcesCB& release_media_resources_cb,
-                    const GURL& frame_url);
+                    const ReleaseMediaResourcesCB& release_media_resources_cb);
   virtual ~MediaPlayerBridge();
 
   // Initialize this object and extract the metadata from the media.
diff --git a/media/base/android/media_source_player.cc b/media/base/android/media_source_player.cc
index 6eb5677..45e0e4f 100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -28,13 +28,11 @@ MediaSourcePlayer::MediaSourcePlayer(
     MediaPlayerManager* manager,
     const RequestMediaResourcesCB& request_media_resources_cb,
     const ReleaseMediaResourcesCB& release_media_resources_cb,
-    scoped_ptr<DemuxerAndroid> demuxer,
-    const GURL& frame_url)
+    scoped_ptr<DemuxerAndroid> demuxer)
     : MediaPlayerAndroid(player_id,
                          manager,
                          request_media_resources_cb,
-                         release_media_resources_cb,
-                         frame_url),
+                         release_media_resources_cb),
       demuxer_(demuxer.Pass()),
       pending_event_(NO_EVENT_PENDING),
       playing_(false),
diff --git a/media/base/android/media_source_player.h b/media/base/android/media_source_player.h
index 689c41e..819ae05 100644
--- a/media/base/android/media_source_player.h
+++ b/media/base/android/media_source_player.h
@@ -42,8 +42,7 @@ class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid,
                     MediaPlayerManager* manager,
                     const RequestMediaResourcesCB& request_media_resources_cb,
                     const ReleaseMediaResourcesCB& release_media_resources_cb,
-                    scoped_ptr<DemuxerAndroid> demuxer,
-                    const GURL& frame_url);
+                    scoped_ptr<DemuxerAndroid> demuxer);
   virtual ~MediaSourcePlayer();
 
   // MediaPlayerAndroid implementation.