Remove ScopedVector from ElementsUploadDataStream

mojo/services/network/url_loader_impl.cc

 // Copyright 2014 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 "mojo/services/network/url_loader_impl.h"
 
 #include "base/memory/scoped_vector.h"

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

Remove this line.

 #include "base/message_loop/message_loop.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/services/network/net_adapters.h"
 #include "mojo/services/network/network_context.h"
 #include "net/base/elements_upload_data_stream.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/base/upload_bytes_element_reader.h"
@@ skipping 165 matching lines @@
           request->headers[i]->value.To<base::StringPiece>();
       if (header == net::HttpRequestHeaders::kReferer) {
         url_request_->SetReferrer(value.as_string());
       } else {
         headers.SetHeader(header, value);
       }
     }
     url_request_->SetExtraRequestHeaders(headers);
   }
   if (request->body) {
-    ScopedVector<net::UploadElementReader> element_readers;
+    std::vector<scoped_ptr<net::UploadElementReader>> element_readers;

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

include <vector>, scoped_ptr

     for (size_t i = 0; i < request->body.size(); ++i) {
-      element_readers.push_back(
-          new UploadDataPipeElementReader(request->body[i].Pass()));
+      element_readers.push_back(make_scoped_ptr(
+          new UploadDataPipeElementReader(request->body[i].Pass())));
     }
     url_request_->set_upload(make_scoped_ptr<net::UploadDataStream>(
-        new net::ElementsUploadDataStream(element_readers.Pass(), 0)));
+        new net::ElementsUploadDataStream(std::move(element_readers), 0)));
   }
   if (request->bypass_cache)
     url_request_->SetLoadFlags(net::LOAD_BYPASS_CACHE);
 
   callback_ = callback;
   response_body_buffer_size_ = request->response_body_buffer_size;
   auto_follow_redirects_ = request->auto_follow_redirects;
 
   url_request_->Start();
 }
@@ skipping 193 matching lines @@
 
 void URLLoaderImpl::ListenForPeerClosed() {
   handle_watcher_.Start(response_body_stream_.get(),
                         MOJO_HANDLE_SIGNAL_PEER_CLOSED,
                         MOJO_DEADLINE_INDEFINITE,
                         base::Bind(&URLLoaderImpl::OnResponseBodyStreamClosed,
                                    base::Unretained(this)));
 }
 
 }  // namespace mojo