Prepare PrerenderWebMediaPlayer for CORS support addition in WebKit.

BUG=123369
TEST=PrerenderBrowserTest.PrerenderHTML5VideoNetwork passes again

Review URL: https://chromiumcodereview.appspot.com/10540053

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

2 files changed, 11 insertions, 6 deletions

diff --git a/chrome/renderer/prerender/prerender_webmediaplayer.cc b/chrome/renderer/prerender/prerender_webmediaplayer.cc
index 8fcc299..417d420 100644
--- a/chrome/renderer/prerender/prerender_webmediaplayer.cc
+++ b/chrome/renderer/prerender/prerender_webmediaplayer.cc
@@ -34,24 +34,28 @@ PrerenderWebMediaPlayer::PrerenderWebMediaPlayer(
                          media_stream_client,
                          media_log),
       is_prerendering_(true),
-      url_loaded_(false) {
+      url_loaded_(false),
+      cors_mode_(CORSModeUnspecified) {
 }
 
 PrerenderWebMediaPlayer::~PrerenderWebMediaPlayer() {}
 
-void PrerenderWebMediaPlayer::load(const WebKit::WebURL& url) {
+void PrerenderWebMediaPlayer::load(const WebKit::WebURL& url,
+                                   CORSMode cors_mode) {
   DCHECK(!url_loaded_);
   if (is_prerendering_) {
     url_to_load_.reset(new WebKit::WebURL(url));
+    cors_mode_ = cors_mode;
     return;
   }
   url_loaded_ = true;
-  WebMediaPlayerImpl::load(url);
+  WebMediaPlayerImpl::load(url, cors_mode);
 }
 
 void PrerenderWebMediaPlayer::cancelLoad() {
   if (is_prerendering_) {
     url_to_load_.reset(NULL);
+    cors_mode_ = CORSModeUnspecified;
     return;
   }
   WebMediaPlayerImpl::cancelLoad();
@@ -73,7 +77,7 @@ void PrerenderWebMediaPlayer::OnSetIsPrerendering(bool is_prerendering) {
   if (is_prerendering_ && !is_prerendering) {
     is_prerendering_ = false;
     if (url_to_load_.get())
-      load(*url_to_load_);
+      load(*url_to_load_, cors_mode_);
   }
 }
 
diff --git a/chrome/renderer/prerender/prerender_webmediaplayer.h b/chrome/renderer/prerender/prerender_webmediaplayer.h
index 9b822fd..1ef4de6 100644
--- a/chrome/renderer/prerender/prerender_webmediaplayer.h
+++ b/chrome/renderer/prerender/prerender_webmediaplayer.h
@@ -36,8 +36,8 @@ class PrerenderWebMediaPlayer
       media::MediaLog* media_log);
   virtual ~PrerenderWebMediaPlayer();
 
-  // WebMediaPlayer methods:
-  virtual void load(const WebKit::WebURL& url) OVERRIDE;
+  // WebMediaPlayerImpl methods:
+  virtual void load(const WebKit::WebURL& url, CORSMode cors_mode) OVERRIDE;
   virtual void cancelLoad() OVERRIDE;
 
  private:
@@ -49,6 +49,7 @@ class PrerenderWebMediaPlayer
   bool is_prerendering_;
   bool url_loaded_;
   scoped_ptr<WebKit::WebURL> url_to_load_;
+  CORSMode cors_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderWebMediaPlayer);
 };