Remove ScopedVector from ElementsUploadDataStream

net/quic/quic_end_to_end_unittest.cc

 // Copyright 2013 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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/base/elements_upload_data_stream.h"
@@ skipping 178 matching lines @@
     request_body_.clear();
     request_body_.reserve(length);
     for (size_t i = 0; i < length; ++i) {
       request_body_.append(1, static_cast<char>(32 + i % (126 - 32)));
     }
   }
 
   // Initializes |request_| for a post of |length| bytes.
   void InitializePostRequest(size_t length) {
     GenerateBody(length);
-    ScopedVector<UploadElementReader> element_readers;
-    element_readers.push_back(
-        new UploadBytesElementReader(request_body_.data(),
-                                     request_body_.length()));
+    std::vector<scoped_ptr<UploadElementReader>> element_readers;

[mmenke, 2015/11/24 17:25:08]

include vector

+    element_readers.push_back(make_scoped_ptr(new UploadBytesElementReader(
+        request_body_.data(), request_body_.length())));
     upload_data_stream_.reset(
-        new ElementsUploadDataStream(element_readers.Pass(), 0));
+        new ElementsUploadDataStream(std::move(element_readers), 0));
     request_.method = "POST";
     request_.url = GURL("https://test.example.com/");
     request_.upload_data_stream = upload_data_stream_.get();
     ASSERT_EQ(OK, request_.upload_data_stream->Init(CompletionCallback()));
   }
 
   // Checks that |consumer| completed and received |status_line| and |body|.
   void CheckResponse(const TestTransactionConsumer& consumer,
                      const std::string& status_line,
                      const std::string& body) {
@@ skipping 98 matching lines @@
   base::MessageLoop::current()->Run();
 
   for (size_t i = 0; i < num_requests; ++i) {
     CheckResponse(*consumers[i], "HTTP/1.1 200 OK", kResponseBody);
   }
   STLDeleteElements(&consumers);
 }
 
 }  // namespace test
 }  // namespace net