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

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

Issue 2578983003: Add AudioStreamRegistry. Move stream counting logic (Closed)
Patch Set: Thread checking. Created 4 years 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 88dc9d37dd9ac1334d7cd4d5990af6c2fab6b674..9c4fa672f5c60ab8799affacb1c023270846b68c 100644
--- a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
@@ -16,6 +16,7 @@
#include "content/browser/media/capture/audio_mirroring_manager.h"
#include "content/browser/media/media_internals.h"
#include "content/browser/renderer_host/media/audio_input_device_manager.h"
+#include "content/browser/renderer_host/media/audio_stream_registry_impl.h"
#include "content/browser/renderer_host/media/media_stream_manager.h"
#include "content/common/media/audio_messages.h"
#include "content/public/browser/media_device_id.h"
@@ -125,11 +126,13 @@ class MockAudioRendererHost : public AudioRendererHost {
public:
MockAudioRendererHost(base::RunLoop* auth_run_loop,
int render_process_id,
+ AudioStreamRegistry* stream_registry,
media::AudioManager* audio_manager,
AudioMirroringManager* mirroring_manager,
MediaStreamManager* media_stream_manager,
const std::string& salt)
: AudioRendererHost(render_process_id,
+ stream_registry,
audio_manager,
mirroring_manager,
media_stream_manager,
@@ -233,13 +236,15 @@ class AudioRendererHostTest : public testing::Test {
audio_manager_(base::MakeUnique<FakeAudioManagerWithAssociations>(
base::ThreadTaskRunnerHandle::Get(),
log_factory.get())),
- render_process_host_(&browser_context_, &auth_run_loop_) {
+ render_process_host_(&browser_context_, &auth_run_loop_),
+ stream_registry_(render_process_host_.GetID()) {
base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kUseFakeDeviceForMediaStream);
media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
host_ = new MockAudioRendererHost(
- &auth_run_loop_, render_process_host_.GetID(), audio_manager_.get(),
- &mirroring_manager_, media_stream_manager_.get(), kSalt);
+ &auth_run_loop_, render_process_host_.GetID(), &stream_registry_,
+ audio_manager_.get(), &mirroring_manager_, media_stream_manager_.get(),
+ kSalt);
// Simulate IPC channel connected.
host_->set_peer_process_for_testing(base::Process::Current());
@@ -512,6 +517,7 @@ class AudioRendererHostTest : public testing::Test {
MockAudioMirroringManager mirroring_manager_;
base::RunLoop auth_run_loop_;
MockRenderProcessHostWithSignaling render_process_host_;
+ AudioStreamRegistryImpl stream_registry_;
scoped_refptr<MockAudioRendererHost> host_;
DISALLOW_COPY_AND_ASSIGN(AudioRendererHostTest);

Powered by Google App Engine
This is Rietveld 408576698