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

Unified Diff: webrtc/modules/audio_device/android/audio_manager.h

Issue 1722083002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_device/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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
Index: webrtc/modules/audio_device/android/audio_manager.h
diff --git a/webrtc/modules/audio_device/android/audio_manager.h b/webrtc/modules/audio_device/android/audio_manager.h
index 26caf61afe2bb917cac8f7e77646a8337dfad8cd..b4264a6f8cd9ec6a815a9483c9cefc1f6ef5463d 100644
--- a/webrtc/modules/audio_device/android/audio_manager.h
+++ b/webrtc/modules/audio_device/android/audio_manager.h
@@ -11,9 +11,10 @@
#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_MANAGER_H_
#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_MANAGER_H_
+#include <memory>
+
#include <jni.h>
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/thread_checker.h"
#include "webrtc/modules/audio_device/android/audio_common.h"
#include "webrtc/modules/audio_device/audio_device_config.h"
@@ -39,7 +40,7 @@ class AudioManager {
class JavaAudioManager {
public:
JavaAudioManager(NativeRegistration* native_registration,
- rtc::scoped_ptr<GlobalRef> audio_manager);
+ std::unique_ptr<GlobalRef> audio_manager);
~JavaAudioManager();
bool Init();
@@ -48,7 +49,7 @@ class AudioManager {
bool IsDeviceBlacklistedForOpenSLESUsage();
private:
- rtc::scoped_ptr<GlobalRef> audio_manager_;
+ std::unique_ptr<GlobalRef> audio_manager_;
jmethodID init_;
jmethodID dispose_;
jmethodID is_communication_mode_enabled_;
@@ -128,13 +129,13 @@ class AudioManager {
AttachCurrentThreadIfNeeded attach_thread_if_needed_;
// Wraps the JNI interface pointer and methods associated with it.
- rtc::scoped_ptr<JNIEnvironment> j_environment_;
+ std::unique_ptr<JNIEnvironment> j_environment_;
// Contains factory method for creating the Java object.
- rtc::scoped_ptr<NativeRegistration> j_native_registration_;
+ std::unique_ptr<NativeRegistration> j_native_registration_;
// Wraps the Java specific parts of the AudioManager.
- rtc::scoped_ptr<AudioManager::JavaAudioManager> j_audio_manager_;
+ std::unique_ptr<AudioManager::JavaAudioManager> j_audio_manager_;
AudioDeviceModule::AudioLayer audio_layer_;
« no previous file with comments | « webrtc/modules/audio_device/android/audio_device_unittest.cc ('k') | webrtc/modules/audio_device/android/audio_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698