Index: content/renderer/media/android/webmediaplayer_android.cc |
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc |
index 419aee199185af9de76345e7e2d198f60385c2f0..713233c7ba57fccb16dced9f82ec4aa17d6b5851 100644 |
--- a/content/renderer/media/android/webmediaplayer_android.cc |
+++ b/content/renderer/media/android/webmediaplayer_android.cc |
@@ -228,11 +228,6 @@ void WebMediaPlayerAndroid::load(LoadType load_type, |
cors_mode, |
base::Bind(&WebMediaPlayerAndroid::DidLoadMediaInfo, |
weak_factory_.GetWeakPtr()))); |
- // TODO(qinmin): The url might be redirected when android media player |
- // requests the stream. As a result, we cannot guarantee there is only |
- // a single origin. Remove the following line when b/12573548 is fixed. |
- // Check http://crbug.com/334204. |
palmer
2014/07/22 19:19:47
We should retain this comment, and re-open issue 3
qinmin
2014/07/30 03:12:02
moved it to another place
|
- info_loader_->set_single_origin(false); |
info_loader_->Start(frame_); |
} |
@@ -240,7 +235,8 @@ void WebMediaPlayerAndroid::load(LoadType load_type, |
GURL first_party_url = frame_->document().firstPartyForCookies(); |
player_manager_->Initialize( |
player_type_, player_id_, url, first_party_url, demuxer_client_id, |
- frame_->document().url()); |
+ frame_->document().url(), hasSingleSecurityOrigin(), |
+ cors_mode != CORSModeAnonymous); |
if (player_manager_->ShouldEnterFullscreen(frame_)) |
player_manager_->EnterFullscreen(player_id_, frame_); |