| 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 c263ce7e0a34ec51ab2eb89f4f90cee03aa97090..21aeda0bb28acd4d3ccafef9339287c722701c77 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
|
| @@ -518,21 +518,16 @@ void ExtensionWebRequestTest::FireURLRequestWithData(
|
| content_type,
|
| true /* overwrite */);
|
| }
|
| - 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(
|
| - base::ThreadTaskRunnerHandle::Get()
|
| - .get(),
|
| - base::FilePath(),
|
| - 0,
|
| - 0,
|
| - base::Time()));
|
| - element_readers.push_back(
|
| - new net::UploadBytesElementReader(&(bytes_2[0]), bytes_2.size()));
|
| + std::vector<scoped_ptr<net::UploadElementReader>> element_readers;
|
| + element_readers.push_back(make_scoped_ptr(
|
| + new net::UploadBytesElementReader(&(bytes_1[0]), bytes_1.size())));
|
| + element_readers.push_back(make_scoped_ptr(new net::UploadFileElementReader(
|
| + base::ThreadTaskRunnerHandle::Get().get(), base::FilePath(), 0, 0,
|
| + base::Time())));
|
| + element_readers.push_back(make_scoped_ptr(
|
| + new net::UploadBytesElementReader(&(bytes_2[0]), bytes_2.size())));
|
| request->set_upload(make_scoped_ptr(
|
| - new net::ElementsUploadDataStream(element_readers.Pass(), 0)));
|
| + new net::ElementsUploadDataStream(std::move(element_readers), 0)));
|
| ipc_sender_.PushTask(base::Bind(&base::DoNothing));
|
| request->Start();
|
| }
|
|
|