Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(535)

Unified Diff: media/midi/midi_manager_android.h

Issue 1915443003: Replace scoped_ptr with std::unique_ptr in //media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptr-media-base
Patch Set: scopedptr-media: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/midi/midi_manager_alsa_unittest.cc ('k') | media/midi/midi_manager_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « media/midi/midi_manager_alsa_unittest.cc ('k') | media/midi/midi_manager_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698