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

Unified Diff: webrtc/modules/audio_device/test/audio_device_test_api.cc

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/test/audio_device_test_api.cc
diff --git a/webrtc/modules/audio_device/test/audio_device_test_api.cc b/webrtc/modules/audio_device/test/audio_device_test_api.cc
index f2861ec3e55ec7a273e2ef0e9b6f48cb28810d6e..a564e355845e3b231a54b10a5e2d0751ca92779c 100644
--- a/webrtc/modules/audio_device/test/audio_device_test_api.cc
+++ b/webrtc/modules/audio_device/test/audio_device_test_api.cc
@@ -12,6 +12,8 @@
#include <stdio.h>
#include <string.h>
+#include <memory>
+
#include "webrtc/modules/audio_device/test/audio_device_test_defines.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -140,7 +142,8 @@ class AudioDeviceAPITest: public testing::Test {
virtual ~AudioDeviceAPITest() {}
static void SetUpTestCase() {
- process_thread_ = ProcessThread::Create("ProcessThread");
+ process_thread_ =
+ rtc::ScopedToUnique(ProcessThread::Create("ProcessThread"));
process_thread_->Start();
// Windows:
@@ -300,7 +303,7 @@ class AudioDeviceAPITest: public testing::Test {
// TODO(henrika): Get rid of globals.
static bool linux_alsa_;
- static rtc::scoped_ptr<ProcessThread> process_thread_;
+ static std::unique_ptr<ProcessThread> process_thread_;
static AudioDeviceModule* audio_device_;
static AudioTransportAPI* audio_transport_;
static AudioEventObserverAPI* event_observer_;
@@ -308,7 +311,7 @@ class AudioDeviceAPITest: public testing::Test {
// Must be initialized like this to handle static SetUpTestCase() above.
bool AudioDeviceAPITest::linux_alsa_ = false;
-rtc::scoped_ptr<ProcessThread> AudioDeviceAPITest::process_thread_;
+std::unique_ptr<ProcessThread> AudioDeviceAPITest::process_thread_;
AudioDeviceModule* AudioDeviceAPITest::audio_device_ = NULL;
AudioTransportAPI* AudioDeviceAPITest::audio_transport_ = NULL;
AudioEventObserverAPI* AudioDeviceAPITest::event_observer_ = NULL;
« no previous file with comments | « webrtc/modules/audio_device/mac/audio_device_mac.h ('k') | webrtc/modules/audio_device/test/func_test_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698