Fold WebDataSource into BufferedDataSource.

webkit/media/buffered_data_source.cc

Index: webkit/media/buffered_data_source.cc
diff --git a/webkit/media/buffered_data_source.cc b/webkit/media/buffered_data_source.cc
index 1d39684e2e31b3c82dcceefb75d8a1584b8dc42c..151fe861562c37f41bba164572d14e19568c0931 100644
--- a/webkit/media/buffered_data_source.cc
+++ b/webkit/media/buffered_data_source.cc
@@ -5,6 +5,7 @@
 #include "webkit/media/buffered_data_source.h"
 
 #include "base/bind.h"
+#include "base/message_loop.h"
 #include "media/base/media_log.h"
 #include "net/base/net_errors.h"
 
@@ -107,6 +108,18 @@ void BufferedDataSource::Initialize(
       frame_);
 }
 
+bool BufferedDataSource::HasSingleOrigin() {
+  DCHECK(MessageLoop::current() == render_loop_);
+  return loader_.get() ? loader_->HasSingleOrigin() : true;

[Ami GONE FROM CHROMIUM, 2012/03/27 05:16:19]

(predates your CL, but)
Is it right to default open like this, or should this be a DCHECK(loader_) to
prevent being asked this question before Initialize() is called, and thus before
we can pass a judgement on the single-origin-ness of this object?
(I worry about someone caching the answer and then Initializing with a
not-single-origin URL/loader).

[scherkus (not reviewing), 2012/03/27 14:10:06]

Good catch!

Technically we can get a false value even if loader_ exists (i.e., BRL hasn't
received an HTTP response yet so it returns default value).

DCHECK() added to make sure initialization has completed.

+}
+
+void BufferedDataSource::Abort() {
+  DCHECK(MessageLoop::current() == render_loop_);
+
+  CleanupTask();
+  frame_ = NULL;
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // media::Filter implementation.
 void BufferedDataSource::Stop(const base::Closure& closure) {
@@ -174,18 +187,6 @@ bool BufferedDataSource::IsStreaming() {
   return streaming_;
 }
 
-bool BufferedDataSource::HasSingleOrigin() {
-  DCHECK(MessageLoop::current() == render_loop_);
-  return loader_.get() ? loader_->HasSingleOrigin() : true;
-}
-
-void BufferedDataSource::Abort() {
-  DCHECK(MessageLoop::current() == render_loop_);
-
-  CleanupTask();
-  frame_ = NULL;
-}
-
 /////////////////////////////////////////////////////////////////////////////
 // Render thread tasks.
 void BufferedDataSource::ReadTask(