net: Move ownership of UploadDataStream from URLRequestHttpJob to URLRequest

chrome/browser/automation/url_request_automation_job.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 "chrome/browser/automation/url_request_automation_job.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "chrome/browser/automation/automation_resource_message_filter.h"
 #include "chrome/common/automation_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
+#include "net/base/upload_bytes_element_reader.h"
+#include "net/base/upload_data_stream.h"
+#include "net/base/upload_file_element_reader.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 #include "net/url_request/http_user_agent_settings.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 
 using base::Time;
 using base::TimeDelta;
@@ skipping 427 matching lines @@
     referrer = GURL();
   }
 
   // Get the resource type (main_frame/script/image/stylesheet etc.
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);
   ResourceType::Type resource_type = ResourceType::MAIN_FRAME;
   if (info) {
     resource_type = info->GetResourceType();
   }
 
+  // Construct UploadData from UploadDataStream.
+  const net::UploadDataStream* upload_data_stream = request_->get_upload();

[ananta, 2012/11/28 02:21:18]

This code seems generic enough to move to a helper function?

[hashimoto, 2012/11/28 02:34:05]

Done.

+  scoped_refptr<net::UploadData> upload_data;
+  if (upload_data_stream) {
+    upload_data = new net::UploadData();
+    const ScopedVector<net::UploadElementReader>& element_readers =
+        upload_data_stream->element_readers();
+    for (size_t i = 0; i < element_readers.size(); ++i) {
+      const net::UploadElementReader* reader = element_readers[i];
+      if (reader->AsBytesReader()) {
+        const net::UploadBytesElementReader* bytes_reader =
+            reader->AsBytesReader();
+        upload_data->AppendBytes(bytes_reader->bytes(), bytes_reader->length());
+      } else if (reader->AsFileReader()) {
+        const net::UploadFileElementReader* file_reader =
+            reader->AsFileReader();
+        upload_data->AppendFileRange(file_reader->path(),
+                                     file_reader->range_offset(),
+                                     file_reader->range_length(),
+                                     file_reader->expected_modification_time());
+      } else {
+        NOTIMPLEMENTED();
+      }
+    }
+  }
+
   // Ask automation to start this request.
   AutomationURLRequest automation_request;
   automation_request.url = request_->url().spec();
   automation_request.method = request_->method();
   automation_request.referrer = referrer.spec();
   automation_request.extra_request_headers = new_request_headers.ToString();
-  automation_request.upload_data = request_->get_upload_mutable();
+  automation_request.upload_data = upload_data;
   automation_request.resource_type = resource_type;
   automation_request.load_flags = request_->load_flags();
 
   DCHECK(message_filter_);
   message_filter_->Send(new AutomationMsg_RequestStart(
       tab_, id_, automation_request));
 }
 
 void URLRequestAutomationJob::DisconnectFromMessageFilter() {
   if (message_filter_) {
@@ skipping 16 matching lines @@
   if (!is_done()) {
     NotifyDone(request_status_);
   }
   // Reset any pending reads.
   if (pending_buf_) {
     pending_buf_ = NULL;
     pending_buf_size_ = 0;
     NotifyReadComplete(0);
   }
 }