Index: media/midi/midi_device_android.h |
diff --git a/media/midi/midi_device_android.h b/media/midi/midi_device_android.h |
index 34575cfbeaef2894370947a70ccd2ab60f4bf685..cb44c330eadd396d23a70761027bb5e1519687e8 100644 |
--- a/media/midi/midi_device_android.h |
+++ b/media/midi/midi_device_android.h |
@@ -6,10 +6,11 @@ |
#define MEDIA_MIDI_MIDI_DEVICE_ANDROID_H_ |
#include <jni.h> |
+#include <memory> |
#include <string> |
+#include <vector> |
#include "base/android/scoped_java_ref.h" |
-#include "base/memory/scoped_vector.h" |
#include "media/midi/midi_input_port_android.h" |
namespace midi { |
@@ -27,10 +28,12 @@ class MidiDeviceAndroid final { |
std::string GetProductName(); |
std::string GetDeviceVersion(); |
- const ScopedVector<MidiInputPortAndroid>& input_ports() const { |
+ const std::vector<std::unique_ptr<MidiInputPortAndroid>>& input_ports() |
+ const { |
return input_ports_; |
} |
- const ScopedVector<MidiOutputPortAndroid>& output_ports() const { |
+ const std::vector<std::unique_ptr<MidiOutputPortAndroid>>& output_ports() |
+ const { |
return output_ports_; |
} |
bool HasRawDevice(JNIEnv* env, jobject raw_device) const { |
@@ -39,8 +42,8 @@ class MidiDeviceAndroid final { |
private: |
base::android::ScopedJavaGlobalRef<jobject> raw_device_; |
- ScopedVector<MidiInputPortAndroid> input_ports_; |
- ScopedVector<MidiOutputPortAndroid> output_ports_; |
+ std::vector<std::unique_ptr<MidiInputPortAndroid>> input_ports_; |
+ std::vector<std::unique_ptr<MidiOutputPortAndroid>> output_ports_; |
}; |
} // namespace midi |