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

Unified Diff: content/browser/renderer_host/media/audio_renderer_host_unittest.cc

Issue 1122393004: Add support for switching the audio output device for HTMLMediaElements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes to MediaPlayers so that they invoke callbacks in the correct threads. First complete implem… Created 5 years, 7 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: content/browser/renderer_host/media/audio_renderer_host_unittest.cc
diff --git a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
index c50430e074e2ea540346923383fabbf8c5081507..a2e2d6784907529b987f89d365cf3e78c8fad971 100644
--- a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
@@ -55,12 +55,14 @@ class MockAudioRendererHost : public AudioRendererHost {
MockAudioRendererHost(media::AudioManager* audio_manager,
AudioMirroringManager* mirroring_manager,
MediaInternals* media_internals,
- MediaStreamManager* media_stream_manager)
+ MediaStreamManager* media_stream_manager,
+ const ResourceContext::SaltCallback& salt_callback)
: AudioRendererHost(kRenderProcessId,
audio_manager,
mirroring_manager,
media_internals,
- media_stream_manager),
+ media_stream_manager,
+ salt_callback),
shared_memory_length_(0) {}
// A list of mock methods.
@@ -140,6 +142,16 @@ class MockAudioRendererHost : public AudioRendererHost {
DISALLOW_COPY_AND_ASSIGN(MockAudioRendererHost);
};
+namespace {
+ std::string ReturnMockSalt() {
+ return std::string();
+ }
+
+ ResourceContext::SaltCallback GetMockSaltCallback() {
+ return base::Bind(&ReturnMockSalt);
+ }
+}
+
class AudioRendererHostTest : public testing::Test {
public:
AudioRendererHostTest() {
@@ -150,7 +162,8 @@ class AudioRendererHostTest : public testing::Test {
host_ = new MockAudioRendererHost(audio_manager_.get(),
&mirroring_manager_,
MediaInternals::GetInstance(),
- media_stream_manager_.get());
+ media_stream_manager_.get(),
+ GetMockSaltCallback());
// Simulate IPC channel connected.
host_->set_peer_process_for_testing(base::Process::Current());

Powered by Google App Engine
This is Rietveld 408576698