Fix for cross-origin video check for webgl on android

content/renderer/media/android/webmediaplayer_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/android/webmediaplayer_android.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 210 matching lines @@
           base::Bind(&WebMediaPlayerAndroid::OnDurationChanged,
                      weak_factory_.GetWeakPtr()));
     }
   } else {
     info_loader_.reset(
         new MediaInfoLoader(
             url,
             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 334204 and
https://b.corp.google.com/issue?id=12573548, right?

[qinmin, 2014/07/30 03:12:02]

moved it to another place

-    info_loader_->set_single_origin(false);
     info_loader_->Start(frame_);
   }
 
   url_ = url;
   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_);
 
   UpdateNetworkState(WebMediaPlayer::NetworkStateLoading);
   UpdateReadyState(WebMediaPlayer::ReadyStateHaveNothing);
 }
 
 void WebMediaPlayerAndroid::DidLoadMediaInfo(MediaInfoLoader::Status status) {
   DCHECK(!media_source_delegate_);
@@ skipping 1283 matching lines @@
     player_manager_->EnterFullscreen(player_id_, frame_);
     SetNeedsEstablishPeer(false);
   }
 }
 
 bool WebMediaPlayerAndroid::canEnterFullscreen() const {
   return player_manager_->CanEnterFullscreen(frame_);
 }
 
 }  // namespace content