MultibufferDataSource: Handle HasSingleOrigin() before init completes.

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 230 matching lines @@
 
 void MultibufferDataSource::SetBufferingStrategy(
     BufferingStrategy buffering_strategy) {
   DCHECK(render_task_runner_->BelongsToCurrentThread());
   buffering_strategy_ = buffering_strategy;
   UpdateBufferSizes();
 }
 
 bool MultibufferDataSource::HasSingleOrigin() {
   DCHECK(render_task_runner_->BelongsToCurrentThread());
-  DCHECK(init_cb_.is_null() && reader_.get())
-      << "Initialize() must complete before calling HasSingleOrigin()";
+  // Before initialization completes there is no risk of leaking data. Callers
+  // are required to order checks such that this isn't a race.
+  if (!init_cb_.is_null())
+    return true;

[hubbe, 2016/09/13 22:43:23]

single_origin_ defaults to true, so this if statement is not required I think.

[sandersd (OOO until July 31), 2016/09/13 22:50:37]

But now it looks like it took me seconds to make this CL, instead of minutes!

   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;
   if (failed_)
@@ skipping 334 matching lines @@
   reader_->SetPinRange(back_buffer, kMaxBufferPreload + kPreloadHighExtra);
 
   if (preload_ == METADATA) {
     reader_->SetPreload(0, 0);
   } else {
     reader_->SetPreload(preload_high, preload);
   }
 }
 
 }  // namespace media