net: Change argument of URLRequest::set_upload from UploadData to UploadDataStream

net/url_request/url_fetcher_core.cc

 // Copyright (c) 2012 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 "net/url_request/url_fetcher_core.h"
 
 #include "base/bind.h"
 #include "base/file_util_proxy.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/tracked_objects.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
-#include "net/base/upload_data.h"
+#include "net/base/upload_bytes_element_reader.h"
+#include "net/base/upload_data_stream.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_throttler_manager.h"
 
 namespace {
 
 const int kBufferSize = 4096;
 const int kUploadProgressTimerInterval = 100;
@@ skipping 667 matching lines @@
 
     case URLFetcher::POST:
     case URLFetcher::PUT:
       DCHECK(!upload_content_type_.empty());
 
       request_->set_method(
           request_type_ == URLFetcher::POST ? "POST" : "PUT");
       extra_request_headers_.SetHeader(HttpRequestHeaders::kContentType,
                                        upload_content_type_);
       if (!upload_content_.empty()) {
-        scoped_refptr<UploadData> upload_data(new UploadData());
-        upload_data->AppendBytes(upload_content_.data(),
-                                 upload_content_.length());
-        request_->set_upload(upload_data);
+        ScopedVector<UploadElementReader> element_readers;
+        element_readers.push_back(new UploadBytesElementReader(
+            upload_content_.data(), upload_content_.size()));
+        request_->set_upload(new UploadDataStream(&element_readers, 0));

[mmenke, 2012/12/11 18:53:21]

Life may be a bit simple if we have the UploadDataStream and
UploadElementReaders implement the same interface, and just have the URLRequest
use that.  A significant enough change that it's probably not reasonable to do
in this CL.

All classes pretty much implement the same interface, except for the chunked
stuff.  Could even have a separate class for the chunked encoding class and the
normal multiple element reader case, though not sure that would get us much.

Suppose this idea would cause issues with the classes that use AsBytesReader() /
AsFileReader().

[hashimoto, 2012/12/12 10:29:07]

Since the main user (webkit_glue::ResourceRequestBody) uses
ResourceRequestBody-Element model which is similar to
UploadDataStream-UploadElmentReader relationship, I think having a helper
function to construct a UploadDataStream from one UploadElementReader (or,
std::string or std::vector<char>) does suffice.
Separating chunked data code to a separate class sounds interesting. Though I'm
not sure if it's really worth doing neither.

[mmenke, 2012/12/12 19:26:41]

Think your two new static methods do a lot to remove the boilerplate code that
was bothering me.  Still think it would be nice to we could make them all
implement the same interface, but given how many times we have to dig into their
guts, that may not be practical.

       }
 
       current_upload_bytes_ = -1;
       // TODO(kinaba): http://crbug.com/118103. Implement upload callback in the
       //  layer and avoid using timer here.
       upload_progress_checker_timer_.reset(
           new base::RepeatingTimer<URLFetcherCore>());
       upload_progress_checker_timer_->Start(
           FROM_HERE,
           base::TimeDelta::FromMilliseconds(kUploadProgressTimerInterval),
@@ skipping 287 matching lines @@
 }
 
 void URLFetcherCore::InformDelegateDownloadDataInDelegateThread(
     scoped_ptr<std::string> download_data) {
   DCHECK(delegate_task_runner_->BelongsToCurrentThread());
   if (delegate_)
     delegate_->OnURLFetchDownloadData(fetcher_, download_data.Pass());
 }
 
 }  // namespace net