Cherrypick Bugfix for cross-origin check

media/blink/multibuffer_data_source.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 "media/blink/multibuffer_data_source.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 95 matching lines @@
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     linked_ptr<UrlIndex> url_index,
     WebFrame* frame,
     MediaLog* media_log,
     BufferedDataSourceHost* host,
     const DownloadingCB& downloading_cb)
     : cors_mode_(cors_mode),
       total_bytes_(kPositionNotSpecified),
       streaming_(false),
       loading_(false),
+      failed_(false),
       render_task_runner_(task_runner),
       url_index_(url_index),
       frame_(frame),
       stop_signal_received_(false),
       media_has_played_(false),
       buffering_strategy_(BUFFERING_STRATEGY_NORMAL),
       single_origin_(true),
       cancel_on_defer_(false),
       preload_(AUTO),
       bitrate_(0),
@@ skipping 52 matching lines @@
   } else {
     reader_->Wait(1,
                   base::Bind(&MultibufferDataSource::StartCallback, weak_ptr_));
   }
 }
 
 void MultibufferDataSource::OnRedirect(
     const scoped_refptr<UrlData>& destination) {
   if (!destination) {
     // A failure occured.
+    failed_ = true;
     if (!init_cb_.is_null()) {
       render_task_runner_->PostTask(
           FROM_HERE,
           base::Bind(&MultibufferDataSource::StartCallback, weak_ptr_));
     } else {
       base::AutoLock auto_lock(lock_);
       StopInternal_Locked();
     }
     StopLoader();
     return;
@@ skipping 51 matching lines @@
       << "Initialize() must complete before calling HasSingleOrigin()";
   return single_origin_;
 }
 
 bool MultibufferDataSource::DidPassCORSAccessCheck() const {
   if (cors_mode_ == UrlData::CORS_UNSPECIFIED)
     return false;
   // If init_cb is set, we initialization is not finished yet.
   if (!init_cb_.is_null())
     return false;
-  // Loader will be false if there was a failure.
-  if (!reader_)
+  if (failed_)
     return false;
   return true;
 }
 
 void MultibufferDataSource::Abort() {
   DCHECK(render_task_runner_->BelongsToCurrentThread());
   {
     base::AutoLock auto_lock(lock_);
     StopInternal_Locked();
   }
@@ skipping 324 matching lines @@
   reader_->SetPinRange(back_buffer, kMaxBufferPreload + kPreloadHighExtra);
 
   if (preload_ == METADATA) {
     reader_->SetPreload(0, 0);
   } else {
     reader_->SetPreload(preload_high, preload);
   }
 }
 
 }  // namespace media