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

chrome/browser/extensions/api/web_request/web_request_api_unittest.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 <map>
 #include <queue>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_path.h"
@@ skipping 21 matching lines @@
 #include "chrome/common/extensions/features/feature.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/base/auth.h"
 #include "net/base/capturing_net_log.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_util.h"
-#include "net/base/upload_data.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/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace helpers = extension_web_request_api_helpers;
 namespace keys = extension_web_request_api_constants;
 
 using base::BinaryValue;
 using base::DictionaryValue;
 using base::ListValue;
 using base::StringValue;
@@ skipping 429 matching lines @@
     const std::vector<char>& bytes_1,
     const std::vector<char>& bytes_2) {
   // The request URL can be arbitrary but must have an HTTP or HTTPS scheme.
   GURL request_url("http://www.example.com");
   net::URLRequest request(request_url, &delegate_, context_.get());
   request.set_method(method);
   if (content_type != NULL)
     request.SetExtraRequestHeaderByName(net::HttpRequestHeaders::kContentType,
                                         content_type,
                                         true /* overwrite */);
-  scoped_refptr<net::UploadData> upload_data(new net::UploadData());
-  upload_data->AppendBytes(&(bytes_1[0]), bytes_1.size());
-  upload_data->AppendFileRange(::FilePath(), 0, 0, base::Time());
-  upload_data->AppendBytes(&(bytes_2[0]), bytes_2.size());
-  request.set_upload(upload_data);
+  ScopedVector<net::UploadElementReader> element_readers;
+  element_readers.push_back(new net::UploadBytesElementReader(
+      &(bytes_1[0]), bytes_1.size()));
+  element_readers.push_back(new net::UploadFileElementReader(
+      ::FilePath(), 0, 0, base::Time()));
+  element_readers.push_back(new net::UploadBytesElementReader(
+      &(bytes_2[0]), bytes_2.size()));
+  request.set_upload(make_scoped_ptr(
+      new net::UploadDataStream(&element_readers, 0)));
   ipc_sender_.PushTask(base::Bind(&base::DoNothing));
   request.Start();
 }
 
 TEST_F(ExtensionWebRequestTest, AccessRequestBodyData) {
   // We verify that URLRequest body is accessible to OnBeforeRequest listeners.
   // These testing steps are repeated twice in a row:
   // 1. Register an extension requesting "requestBody" in ExtraInfoSpec and
   //    file a POST URLRequest with a multipart-encoded form. See it getting
   //    parsed.
@@ skipping 1633 matching lines @@
   EXPECT_TRUE(credentials_set);
   EXPECT_FALSE(auth3.Empty());
   EXPECT_EQ(username, auth1.username());
   EXPECT_EQ(password, auth1.password());
   EXPECT_EQ(1u, warning_set.size());
   EXPECT_TRUE(HasWarning(warning_set, "extid2"));
   EXPECT_EQ(3u, capturing_net_log.GetSize());
 }
 
 }  // namespace extensions