Index: media/audio/audio_output_controller_unittest.cc |
diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc |
index 3e9229da9ba51e9be912f25b309a50f26a5e7bfa..16f7b3d5c8283e9be100a940340ec7894c170d60 100644 |
--- a/media/audio/audio_output_controller_unittest.cc |
+++ b/media/audio/audio_output_controller_unittest.cc |
@@ -9,11 +9,13 @@ |
#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/message_loop/message_loop.h" |
+#include "base/strings/utf_string_conversions.h" |
#include "base/synchronization/waitable_event.h" |
#include "media/audio/audio_manager_base.h" |
#include "media/audio/audio_output_controller.h" |
#include "media/audio/audio_parameters.h" |
#include "media/base/audio_bus.h" |
+#include "media/base/media_resources.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -88,8 +90,16 @@ ACTION(PopulateBuffer) { |
arg0->channel(0)[0] = kBufferNonZeroData; |
} |
+base::string16 FakeLocalizedStringProvider(MessageId message_id) { |
ajm
2015/09/17 05:47:28
I could move this to a fake_media_resources.h if w
ajm
2015/09/18 00:43:21
Ended up doing this because there was another test
|
+ return base::ASCIIToUTF16("FakeString"); |
+} |
+ |
class AudioOutputControllerTest : public testing::Test { |
public: |
+ static void SetUpTestCase() { |
+ SetLocalizedStringProvider(FakeLocalizedStringProvider); |
+ } |
+ |
AudioOutputControllerTest() |
: audio_manager_(AudioManager::CreateForTesting()), |
create_event_(false, false), |
@@ -217,7 +227,7 @@ class AudioOutputControllerTest : public testing::Test { |
.WillOnce(SignalEvent(&play_event_)); |
} |
- controller_->SwitchOutputDevice(AudioManagerBase::kDefaultDeviceName, |
+ controller_->SwitchOutputDevice(AudioManager::GetDefaultDeviceName(), |
base::Bind(&base::DoNothing)); |
} |