Separate BufferedDataSource and BufferedResourceLoader into two files.

webkit/glue/media/simple_data_source.cc

 // Copyright (c) 2010 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 "base/message_loop.h"
 #include "base/process_util.h"
 #include "media/base/filter_host.h"
 #include "net/base/load_flags.h"

[scherkus (not reviewing), 2010/12/14 18:48:19]

nit: alphabetize includes

[annacc, 2010/12/14 21:10:17]

Done.

 #include "net/base/data_url.h"
+#include "net/http/http_util.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"
 #include "webkit/glue/media/simple_data_source.h"
 #include "webkit/glue/webkit_glue.h"
 
-namespace {
-
-const char kHttpScheme[] = "http";
-const char kHttpsScheme[] = "https";
-const char kDataScheme[] = "data";
-
-// A helper method that accepts only HTTP, HTTPS and FILE protocol.
-bool IsDataProtocol(const GURL& url) {
-  return url.SchemeIs(kDataScheme);
-}
-
-}  // namespace
-
 namespace webkit_glue {
 
 SimpleDataSource::SimpleDataSource(
     MessageLoop* render_loop,
     WebKit::WebFrame* frame)
     : render_loop_(render_loop),
       frame_(frame),
       size_(-1),
       single_origin_(true),
       state_(UNINITIALIZED),
@@ skipping 187 matching lines @@
   AutoLock auto_lock(lock_);
 
   // We may have stopped.
   if (state_ == STOPPED)
     return;
 
   CHECK(frame_);
 
   DCHECK_EQ(state_, INITIALIZING);
 
-  if (IsDataProtocol(url_)) {
+  if (net::HttpUtil::IsDataProtocol(url_)) {
     // If this using data protocol, we just need to decode it.
     std::string mime_type, charset;
     bool success = net::DataURL::Parse(url_, &mime_type, &charset, &data_);
 
     // Don't care about the mime-type just proceed if decoding was successful.
     size_ = data_.length();
     DoneInitialization_Locked(success);
   } else {
     // Prepare the request.
     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);
   }
 }
 
 void SimpleDataSource::CancelTask() {
   DCHECK(MessageLoop::current() == render_loop_);
   AutoLock auto_lock(lock_);
   DCHECK_EQ(state_, STOPPED);
 
   // Cancel any pending requests.
   if (url_loader_.get()) {
     url_loader_->cancel();
     url_loader_.reset();
   }
 }
 
 void SimpleDataSource::DoneInitialization_Locked(bool success) {
   lock_.AssertAcquired();
   if (success) {
     state_ = INITIALIZED;
     host()->SetTotalBytes(size_);
     host()->SetBufferedBytes(size_);
     // If scheme is file or data, say we are loaded.
-    host()->SetLoaded(url_.SchemeIsFile() || IsDataProtocol(url_));
+    host()->SetLoaded(url_.SchemeIsFile() || net::HttpUtil::IsDataProtocol(url_));

[annacc, 2010/12/14 21:10:17]

Done.

   } else {
     host()->SetError(media::PIPELINE_ERROR_NETWORK);
   }
   initialize_callback_->Run();
   initialize_callback_.reset();
 }
 
 }  // namespace webkit_glue