Reland of Remove ScopedVector from all other codes in media/

media/midi/midi_manager_usb.h

 // 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.
 
 #ifndef MEDIA_MIDI_MIDI_MANAGER_USB_H_
 #define MEDIA_MIDI_MIDI_MANAGER_USB_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 46 matching lines @@
                           base::TimeTicks time) override;
   void OnDeviceAttached(std::unique_ptr<UsbMidiDevice> device) override;
   void OnDeviceDetached(size_t index) override;
 
   // UsbMidiInputStream::Delegate implementation.
   void OnReceivedData(size_t jack_index,
                       const uint8_t* data,
                       size_t size,
                       base::TimeTicks time) override;
 
-  const ScopedVector<UsbMidiOutputStream>& output_streams() const {
+  const std::vector<std::unique_ptr<UsbMidiOutputStream>>& output_streams()
+      const {
     return output_streams_;
   }
   const UsbMidiInputStream* input_stream() const { return input_stream_.get(); }
 
   // Initializes this object.
   // When the initialization finishes, |callback| will be called with the
   // result.
   // When this factory is destroyed during the operation, the operation
   // will be canceled silently (i.e. |callback| will not be called).
   // The function is public just for unit tests. Do not call this function
   // outside code for testing.
   void Initialize(base::Callback<void(mojom::Result result)> callback);
 
  private:
   void OnEnumerateDevicesDone(bool result, UsbMidiDevice::Devices* devices);
   bool AddPorts(UsbMidiDevice* device, int device_id);
 
   std::unique_ptr<UsbMidiDevice::Factory> device_factory_;
-  ScopedVector<UsbMidiDevice> devices_;
-  ScopedVector<UsbMidiOutputStream> output_streams_;
+  std::vector<std::unique_ptr<UsbMidiDevice>> devices_;
+  std::vector<std::unique_ptr<UsbMidiOutputStream>> output_streams_;
   std::unique_ptr<UsbMidiInputStream> input_stream_;
 
   base::Callback<void(mojom::Result result)> initialize_callback_;
 
   // A map from <endpoint_number, cable_number> to the index of input jacks.
   base::hash_map<std::pair<int, int>, size_t> input_jack_dictionary_;
 
   // Lock to ensure the MidiScheduler is being destructed only once in
   // Finalize() on Chrome_IOThread.
   base::Lock scheduler_lock_;
   std::unique_ptr<MidiScheduler> scheduler_;
 
   DISALLOW_COPY_AND_ASSIGN(MidiManagerUsb);
 };
 
 }  // namespace midi
 
 #endif  // MEDIA_MIDI_MIDI_MANAGER_USB_H_