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

Unified Diff: content/test/webrtc_audio_device_test.cc

Issue 81953002: Remove MockMediaInternals and incestuous usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix shutdown. Created 7 years, 1 month 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
« no previous file with comments | « content/test/webrtc_audio_device_test.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/webrtc_audio_device_test.cc
diff --git a/content/test/webrtc_audio_device_test.cc b/content/test/webrtc_audio_device_test.cc
index 605713acda3dd17ae398f597820fb7926b05ed31..641406f0bcc695b2b2a9e0d262944785c019e6f5 100644
--- a/content/test/webrtc_audio_device_test.cc
+++ b/content/test/webrtc_audio_device_test.cc
@@ -12,6 +12,7 @@
#include "base/run_loop.h"
#include "base/synchronization/waitable_event.h"
#include "base/test/test_timeouts.h"
+#include "content/browser/media/media_internals.h"
#include "content/browser/renderer_host/media/audio_input_renderer_host.h"
#include "content/browser/renderer_host/media/audio_mirroring_manager.h"
#include "content/browser/renderer_host/media/audio_renderer_host.h"
@@ -284,7 +285,6 @@ void MAYBE_WebRTCAudioDeviceTest::InitializeIOThread(const char* thread_name) {
MockRTCResourceContext* resource_context =
static_cast<MockRTCResourceContext*>(resource_context_.get());
resource_context->set_request_context(test_request_context_.get());
- media_internals_.reset(new MockMediaInternals());
// Create our own AudioManager, AudioMirroringManager and MediaStreamManager.
audio_manager_.reset(media::AudioManager::Create());
@@ -317,9 +317,12 @@ void MAYBE_WebRTCAudioDeviceTest::CreateChannel(const char* name) {
ASSERT_TRUE(channel_->Connect());
static const int kRenderProcessId = 1;
- audio_render_host_ = new TestAudioRendererHost(
- kRenderProcessId, audio_manager_.get(), mirroring_manager_.get(),
- media_internals_.get(), media_stream_manager_.get(), channel_.get());
+ audio_render_host_ = new TestAudioRendererHost(kRenderProcessId,
+ audio_manager_.get(),
+ mirroring_manager_.get(),
+ MediaInternals::GetInstance(),
+ media_stream_manager_.get(),
+ channel_.get());
audio_render_host_->set_peer_pid_for_testing(base::GetCurrentProcId());
audio_input_renderer_host_ =
« no previous file with comments | « content/test/webrtc_audio_device_test.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698