Index: chrome/browser/extensions/api/web_request/web_request_api_unittest.cc |
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc |
index 035177b3a9f18ab7502cd88e646b9453ca0c8425..5e67b5cce33614d02a3fdabeb6cecb2b855fb8d1 100644 |
--- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc |
+++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc |
@@ -39,7 +39,9 @@ |
#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" |
@@ -489,11 +491,14 @@ void ExtensionWebRequestTest::FireURLRequestWithData( |
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(new net::UploadDataStream(&element_readers, 0)); |
ipc_sender_.PushTask(base::Bind(&base::DoNothing)); |
request.Start(); |
} |