Index: webrtc/modules/audio_device/android/audio_device_unittest.cc |
diff --git a/webrtc/modules/audio_device/android/audio_device_unittest.cc b/webrtc/modules/audio_device/android/audio_device_unittest.cc |
index e3d657dbc1de26fb5dda3721fe3412b36c1be46a..8c0053912aca26a1fb8f984b803be07663a930b6 100644 |
--- a/webrtc/modules/audio_device/android/audio_device_unittest.cc |
+++ b/webrtc/modules/audio_device/android/audio_device_unittest.cc |
@@ -20,6 +20,7 @@ |
#include "webrtc/base/arraysize.h" |
#include "webrtc/base/criticalsection.h" |
#include "webrtc/base/scoped_ptr.h" |
+#include "webrtc/base/scoped_ref_ptr.h" |
#include "webrtc/modules/audio_device/android/audio_common.h" |
#include "webrtc/modules/audio_device/android/audio_manager.h" |
#include "webrtc/modules/audio_device/android/build_info.h" |
@@ -28,7 +29,6 @@ |
#include "webrtc/modules/audio_device/include/audio_device.h" |
#include "webrtc/system_wrappers/interface/clock.h" |
#include "webrtc/system_wrappers/interface/event_wrapper.h" |
-#include "webrtc/system_wrappers/interface/scoped_refptr.h" |
#include "webrtc/system_wrappers/interface/sleep.h" |
#include "webrtc/test/testsupport/fileutils.h" |
@@ -536,7 +536,7 @@ class AudioDeviceTest : public ::testing::Test { |
return audio_manager()->GetDelayEstimateInMilliseconds(); |
} |
- scoped_refptr<AudioDeviceModule> audio_device() const { |
+ rtc::scoped_refptr<AudioDeviceModule> audio_device() const { |
return audio_device_; |
} |
@@ -557,9 +557,9 @@ class AudioDeviceTest : public ::testing::Test { |
return audio_device_impl()->GetAudioDeviceBuffer(); |
} |
- scoped_refptr<AudioDeviceModule> CreateAudioDevice( |
+ rtc::scoped_refptr<AudioDeviceModule> CreateAudioDevice( |
AudioDeviceModule::AudioLayer audio_layer) { |
- scoped_refptr<AudioDeviceModule> module( |
+ rtc::scoped_refptr<AudioDeviceModule> module( |
AudioDeviceModuleImpl::Create(0, audio_layer)); |
return module; |
} |
@@ -594,7 +594,7 @@ class AudioDeviceTest : public ::testing::Test { |
int TestDelayOnAudioLayer( |
const AudioDeviceModule::AudioLayer& layer_to_test) { |
- scoped_refptr<AudioDeviceModule> audio_device; |
+ rtc::scoped_refptr<AudioDeviceModule> audio_device; |
audio_device = CreateAudioDevice(layer_to_test); |
EXPECT_NE(audio_device.get(), nullptr); |
AudioManager* audio_manager = GetAudioManager(audio_device.get()); |
@@ -604,7 +604,7 @@ class AudioDeviceTest : public ::testing::Test { |
AudioDeviceModule::AudioLayer TestActiveAudioLayer( |
const AudioDeviceModule::AudioLayer& layer_to_test) { |
- scoped_refptr<AudioDeviceModule> audio_device; |
+ rtc::scoped_refptr<AudioDeviceModule> audio_device; |
audio_device = CreateAudioDevice(layer_to_test); |
EXPECT_NE(audio_device.get(), nullptr); |
AudioDeviceModule::AudioLayer active; |
@@ -685,7 +685,7 @@ class AudioDeviceTest : public ::testing::Test { |
} |
rtc::scoped_ptr<EventWrapper> test_is_done_; |
- scoped_refptr<AudioDeviceModule> audio_device_; |
+ rtc::scoped_refptr<AudioDeviceModule> audio_device_; |
AudioParameters playout_parameters_; |
AudioParameters record_parameters_; |
rtc::scoped_ptr<BuildInfo> build_info_; |