Do not use vector<scoped_ptr<>>.

It requires library support so that vector knows about move-only types. This
is a C++11 library feature, and these aren't allowed yet as they don't work
on all platforms yet.

BUG=none

Review URL: https://codereview.chromium.org/700723004

Cr-Commit-Position: refs/heads/master@{#302964}

2 files changed, 6 insertions, 6 deletions

diff --git a/media/midi/midi_manager_win.cc b/media/midi/midi_manager_win.cc
index 439ce93..bc4b15d 100644
--- a/media/midi/midi_manager_win.cc
+++ b/media/midi/midi_manager_win.cc
@@ -518,7 +518,7 @@ void MidiManagerWin::StartInitialization() {
         base::IntToString(static_cast<int>(caps.vDriverVersion)));
     AddInputPort(info);
     in_device->set_port_index(inport_index++);
-    in_devices_.push_back(in_device.Pass());
+    in_devices_.push_back(in_device.release());
   }
 
   const UINT num_out_devices = midiOutGetNumDevs();
@@ -540,7 +540,7 @@ void MidiManagerWin::StartInitialization() {
         base::WideToUTF8(caps.szPname),
         base::IntToString(static_cast<int>(caps.vDriverVersion)));
     AddOutputPort(info);
-    out_devices_.push_back(out_port.Pass());
+    out_devices_.push_back(out_port.release());
   }
 
   CompleteInitialization(MIDI_OK);
@@ -575,7 +575,7 @@ void MidiManagerWin::DispatchSendMidiData(MidiManagerClient* client,
   if (!send_thread_.IsRunning())
     send_thread_.Start();
 
-  OutDeviceInfo* out_port = out_devices_[port_index].get();
+  OutDeviceInfo* out_port = out_devices_[port_index];
   send_thread_.message_loop()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&OutDeviceInfo::Send, base::Unretained(out_port), data),
diff --git a/media/midi/midi_manager_win.h b/media/midi/midi_manager_win.h
index 63096ab..ff40e98 100644
--- a/media/midi/midi_manager_win.h
+++ b/media/midi/midi_manager_win.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
 #include "base/threading/thread.h"
 #include "media/midi/midi_manager.h"
 
@@ -29,8 +29,8 @@ class MidiManagerWin : public MidiManager {
  private:
   class InDeviceInfo;
   class OutDeviceInfo;
-  std::vector<scoped_ptr<InDeviceInfo> > in_devices_;
-  std::vector<scoped_ptr<OutDeviceInfo> > out_devices_;
+  ScopedVector<InDeviceInfo> in_devices_;
+  ScopedVector<OutDeviceInfo> out_devices_;
   base::Thread send_thread_;
   DISALLOW_COPY_AND_ASSIGN(MidiManagerWin);
 };