Index: media/midi/midi_manager_android.h |
diff --git a/media/midi/midi_manager_android.h b/media/midi/midi_manager_android.h |
index 97f156dfcc759de3d759797967f5356c55f7be4a..4269d5d8526d943b98a03d8ff7b4e3aac0bd56fb 100644 |
--- a/media/midi/midi_manager_android.h |
+++ b/media/midi/midi_manager_android.h |
@@ -8,11 +8,12 @@ |
#include <jni.h> |
#include <stddef.h> |
#include <stdint.h> |
+ |
+#include <memory> |
#include <vector> |
#include "base/android/scoped_java_ref.h" |
#include "base/containers/hash_tables.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/scoped_vector.h" |
#include "base/time/time.h" |
#include "media/midi/midi_input_port_android.h" |
@@ -60,7 +61,7 @@ class MidiManagerAndroid final : public MidiManager, |
static bool Register(JNIEnv* env); |
private: |
- void AddDevice(scoped_ptr<MidiDeviceAndroid> device); |
+ void AddDevice(std::unique_ptr<MidiDeviceAndroid> device); |
void AddInputPortAndroid(MidiInputPortAndroid* port, |
MidiDeviceAndroid* device); |
void AddOutputPortAndroid(MidiOutputPortAndroid* port, |
@@ -80,7 +81,7 @@ class MidiManagerAndroid final : public MidiManager, |
base::hash_map<MidiOutputPortAndroid*, size_t> output_port_to_index_; |
base::android::ScopedJavaGlobalRef<jobject> raw_manager_; |
- scoped_ptr<MidiScheduler> scheduler_; |
+ std::unique_ptr<MidiScheduler> scheduler_; |
}; |
} // namespace midi |