Remove ScopedVector from ElementsUploadDataStream

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/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 500 matching lines @@
   // The request URL can be arbitrary but must have an HTTP or HTTPS scheme.
   GURL request_url("http://www.example.com");
   scoped_ptr<net::URLRequest> request(context_->CreateRequest(
       request_url, net::DEFAULT_PRIORITY, &delegate_));
   request->set_method(method);
   if (content_type != NULL) {
     request->SetExtraRequestHeaderByName(net::HttpRequestHeaders::kContentType,
                                          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();
 }
 
 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 1702 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