Separate BufferedDataSource and BufferedResourceLoader into two files.

webkit/glue/media/simple_data_source.cc

Index: webkit/glue/media/simple_data_source.cc
diff --git a/webkit/glue/media/simple_data_source.cc b/webkit/glue/media/simple_data_source.cc
index 97a9c3915fe59982eeb8ffa31c58b0fc6969ab11..74cb79434a55bba78bb9df0800712af023aac246 100644
--- a/webkit/glue/media/simple_data_source.cc
+++ b/webkit/glue/media/simple_data_source.cc
@@ -5,8 +5,8 @@
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "media/base/filter_host.h"
-#include "net/base/load_flags.h"
 #include "net/base/data_url.h"
+#include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h"
@@ -15,8 +15,6 @@
 
 namespace {
 
-const char kHttpScheme[] = "http";
-const char kHttpsScheme[] = "https";
 const char kDataScheme[] = "data";
 
 // A helper method that accepts only HTTP, HTTPS and FILE protocol.
@@ -246,12 +244,10 @@ void SimpleDataSource::StartTask() {
     WebKit::WebURLRequest request(url_);
 
     frame_->setReferrerForRequest(request, WebKit::WebURL());
-    // TODO(annacc): we should be using createAssociatedURLLoader() instead?
-    frame_->dispatchWillSendRequest(request);
 
     // This flag is for unittests as we don't want to reset |url_loader|
     if (!keep_test_loader_)
-      url_loader_.reset(WebKit::webKitClient()->createURLLoader());
+      url_loader_.reset(frame_->createAssociatedURLLoader());
 
     // Start the resource loading.
     url_loader_->loadAsynchronously(request, this);