Remove ScopedVector from ElementsUploadDataStream

net/base/elements_upload_data_stream.h

 // 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.
 
 #ifndef NET_BASE_ELEMENTS_UPLOAD_DATA_STREAM_H_
 #define NET_BASE_ELEMENTS_UPLOAD_DATA_STREAM_H_
 
 #include "base/basictypes.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "net/base/net_export.h"
 #include "net/base/upload_data_stream.h"
 
 namespace net {
 
 class DrainableIOBuffer;
 class IOBuffer;
 class UploadElementReader;
 
 // A non-chunked UploadDataStream consisting of one or more UploadElements.
 class NET_EXPORT ElementsUploadDataStream : public UploadDataStream {
  public:
-  ElementsUploadDataStream(ScopedVector<UploadElementReader> element_readers,
-                           int64_t identifier);
+  ElementsUploadDataStream(
+      std::vector<scoped_ptr<UploadElementReader>> element_readers,

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

Need to include <vector>

+      int64_t identifier);
 
   ~ElementsUploadDataStream() override;
 
   // Creates an ElementsUploadDataStream with a single reader.  Returns a
   // scoped_ptr<UploadDataStream> for ease of use.
   static scoped_ptr<UploadDataStream> CreateWithReader(
       scoped_ptr<UploadElementReader> reader,
       int64_t identifier);
 
  private:
   // UploadDataStream implementation.
   bool IsInMemory() const override;
-  const ScopedVector<UploadElementReader>* GetElementReaders() const override;
+  const std::vector<scoped_ptr<UploadElementReader>>* GetElementReaders()
+      const override;
   int InitInternal() override;
   int ReadInternal(IOBuffer* buf, int buf_len) override;
   void ResetInternal() override;
 
   // Runs Init() for all element readers.
   // This method is used to implement InitInternal().
   int InitElements(size_t start_index);
 
   // Called when the |index| element finishes initialization. If it succeeded,
   // continues with the |index + 1| element. Calls OnInitCompleted on error or
   // when all elements have been initialized.
   void OnInitElementCompleted(size_t index, int result);
 
   // Reads data from the element readers.
   // This method is used to implement Read().
   int ReadElements(const scoped_refptr<DrainableIOBuffer>& buf);
 
   // Resumes pending read and calls OnReadCompleted with a result when
   // necessary.
   void OnReadElementCompleted(const scoped_refptr<DrainableIOBuffer>& buf,
                               int result);
 
   // Processes result of UploadElementReader::Read(). If |result| indicates
   // success, updates |buf|'s offset. Otherwise, sets |read_failed_| to true.
   void ProcessReadResult(const scoped_refptr<DrainableIOBuffer>& buf,
                          int result);
 
-  ScopedVector<UploadElementReader> element_readers_;
+  std::vector<scoped_ptr<UploadElementReader>> element_readers_;
 
   // Index of the current upload element (i.e. the element currently being
   // read). The index is used as a cursor to iterate over elements in
   // |upload_data_|.
   size_t element_index_;
 
   // True if an error occcured during read operation.
   bool read_failed_;
 
   base::WeakPtrFactory<ElementsUploadDataStream> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ElementsUploadDataStream);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_ELEMENTS_UPLOAD_DATA_STREAM_H_