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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/media/audio_output_delegate_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
« no previous file with comments | « content/browser/renderer_host/media/audio_output_delegate.cc ('k') | content/browser/renderer_host/media/audio_renderer_host.h » ('j') | content/browser/renderer_host/media/audio_stream_registry_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/audio_output_delegate_unittest.cc
diff --git a/content/browser/renderer_host/media/audio_output_delegate_unittest.cc b/content/browser/renderer_host/media/audio_output_delegate_unittest.cc
index a25d127fe3fc7788e441260997b2fd27f024ecd7..dbc47e718752feaeb657d1a7cda2e2b4ecf94779 100644
--- a/content/browser/renderer_host/media/audio_output_delegate_unittest.cc
+++ b/content/browser/renderer_host/media/audio_output_delegate_unittest.cc
@@ -76,7 +76,6 @@ class MockObserver : public content::MediaObserver {
class MockEventHandler : public AudioOutputDelegate::EventHandler {
public:
- MOCK_METHOD1(OnStreamStateChanged, void(bool playing));
MOCK_METHOD3(OnStreamCreated,
void(int stream_id,
base::SharedMemory* shared_memory,
@@ -95,11 +94,20 @@ class DummyAudioOutputStream : public media::AudioOutputStream {
void Close() override {}
};
+class MockAudioStreamRegistry : public AudioStreamRegistry {
+ public:
+ MockAudioStreamRegistry() {}
+ ~MockAudioStreamRegistry() {}
+ MOCK_METHOD1(RegisterOutputStream, void(Stream* stream));
+ MOCK_METHOD1(DeregisterOutputStream, void(Stream* stream));
+ MOCK_METHOD1(OutputStreamStateChanged, void(bool playing));
+};
+
} // namespace
class AudioOutputDelegateTest : public testing::Test {
public:
- AudioOutputDelegateTest() {
+ AudioOutputDelegateTest() : stream_registry_() {
base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kUseFakeDeviceForMediaStream);
@@ -118,6 +126,8 @@ class AudioOutputDelegateTest : public testing::Test {
base::MakeUnique<MediaStreamManager>(audio_manager_.get());
}
+ ~AudioOutputDelegateTest() override {}
+
// Test bodies are here, so that we can run them on the IO thread.
void CreateTest(base::Closure done) {
EXPECT_CALL(media_observer_,
@@ -128,7 +138,7 @@ class AudioOutputDelegateTest : public testing::Test {
AddDiverter(kRenderProcessId, kRenderFrameId, NotNull()));
AudioOutputDelegate::UniquePtr delegate = AudioOutputDelegate::Create(
- &event_handler_, audio_manager_.get(),
+ &event_handler_, &stream_registry_, audio_manager_.get(),
log_factory_.CreateAudioLog(
media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER),
&mirroring_manager_, &media_observer_, kStreamId, kRenderFrameId,
@@ -152,12 +162,12 @@ class AudioOutputDelegateTest : public testing::Test {
AddDiverter(kRenderProcessId, kRenderFrameId, NotNull()));
{
InSequence s;
- EXPECT_CALL(event_handler_, OnStreamStateChanged(true));
- EXPECT_CALL(event_handler_, OnStreamStateChanged(false));
+ EXPECT_CALL(stream_registry_, OutputStreamStateChanged(true));
+ EXPECT_CALL(stream_registry_, OutputStreamStateChanged(false));
}
AudioOutputDelegate::UniquePtr delegate = AudioOutputDelegate::Create(
- &event_handler_, audio_manager_.get(),
+ &event_handler_, &stream_registry_, audio_manager_.get(),
log_factory_.CreateAudioLog(
media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER),
&mirroring_manager_, &media_observer_, kStreamId, kRenderFrameId,
@@ -183,7 +193,7 @@ class AudioOutputDelegateTest : public testing::Test {
AddDiverter(kRenderProcessId, kRenderFrameId, NotNull()));
AudioOutputDelegate::UniquePtr delegate = AudioOutputDelegate::Create(
- &event_handler_, audio_manager_.get(),
+ &event_handler_, &stream_registry_, audio_manager_.get(),
log_factory_.CreateAudioLog(
media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER),
&mirroring_manager_, &media_observer_, kStreamId, kRenderFrameId,
@@ -209,14 +219,14 @@ class AudioOutputDelegateTest : public testing::Test {
AddDiverter(kRenderProcessId, kRenderFrameId, NotNull()));
{
InSequence s;
- EXPECT_CALL(event_handler_, OnStreamStateChanged(true));
- EXPECT_CALL(event_handler_, OnStreamStateChanged(false));
- EXPECT_CALL(event_handler_, OnStreamStateChanged(true));
- EXPECT_CALL(event_handler_, OnStreamStateChanged(false));
+ EXPECT_CALL(stream_registry_, OutputStreamStateChanged(true));
+ EXPECT_CALL(stream_registry_, OutputStreamStateChanged(false));
+ EXPECT_CALL(stream_registry_, OutputStreamStateChanged(true));
+ EXPECT_CALL(stream_registry_, OutputStreamStateChanged(false));
}
AudioOutputDelegate::UniquePtr delegate = AudioOutputDelegate::Create(
- &event_handler_, audio_manager_.get(),
+ &event_handler_, &stream_registry_, audio_manager_.get(),
log_factory_.CreateAudioLog(
media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER),
&mirroring_manager_, &media_observer_, kStreamId, kRenderFrameId,
@@ -244,12 +254,12 @@ class AudioOutputDelegateTest : public testing::Test {
AddDiverter(kRenderProcessId, kRenderFrameId, NotNull()));
{
InSequence s;
- EXPECT_CALL(event_handler_, OnStreamStateChanged(true));
- EXPECT_CALL(event_handler_, OnStreamStateChanged(false));
+ EXPECT_CALL(stream_registry_, OutputStreamStateChanged(true));
+ EXPECT_CALL(stream_registry_, OutputStreamStateChanged(false));
}
AudioOutputDelegate::UniquePtr delegate = AudioOutputDelegate::Create(
- &event_handler_, audio_manager_.get(),
+ &event_handler_, &stream_registry_, audio_manager_.get(),
log_factory_.CreateAudioLog(
media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER),
&mirroring_manager_, &media_observer_, kStreamId, kRenderFrameId,
@@ -276,7 +286,7 @@ class AudioOutputDelegateTest : public testing::Test {
AddDiverter(kRenderProcessId, kRenderFrameId, NotNull()));
AudioOutputDelegate::UniquePtr delegate = AudioOutputDelegate::Create(
- &event_handler_, audio_manager_.get(),
+ &event_handler_, &stream_registry_, audio_manager_.get(),
log_factory_.CreateAudioLog(
media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER),
&mirroring_manager_, &media_observer_, kStreamId, kRenderFrameId,
@@ -303,7 +313,7 @@ class AudioOutputDelegateTest : public testing::Test {
AddDiverter(kRenderProcessId, kRenderFrameId, NotNull()));
AudioOutputDelegate::UniquePtr delegate = AudioOutputDelegate::Create(
- &event_handler_, audio_manager_.get(),
+ &event_handler_, &stream_registry_, audio_manager_.get(),
log_factory_.CreateAudioLog(
media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER),
&mirroring_manager_, &media_observer_, kStreamId, kRenderFrameId,
@@ -333,12 +343,12 @@ class AudioOutputDelegateTest : public testing::Test {
AddDiverter(kRenderProcessId, kRenderFrameId, NotNull()));
{
InSequence s;
- EXPECT_CALL(event_handler_, OnStreamStateChanged(true));
- EXPECT_CALL(event_handler_, OnStreamStateChanged(false));
+ EXPECT_CALL(stream_registry_, OutputStreamStateChanged(true));
+ EXPECT_CALL(stream_registry_, OutputStreamStateChanged(false));
}
AudioOutputDelegate::UniquePtr delegate = AudioOutputDelegate::Create(
- &event_handler_, audio_manager_.get(),
+ &event_handler_, &stream_registry_, audio_manager_.get(),
log_factory_.CreateAudioLog(
media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER),
&mirroring_manager_, &media_observer_, kStreamId, kRenderFrameId,
@@ -367,7 +377,7 @@ class AudioOutputDelegateTest : public testing::Test {
AddDiverter(kRenderProcessId, kRenderFrameId, NotNull()));
AudioOutputDelegate::UniquePtr delegate = AudioOutputDelegate::Create(
- &event_handler_, audio_manager_.get(),
+ &event_handler_, &stream_registry_, audio_manager_.get(),
log_factory_.CreateAudioLog(
media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER),
&mirroring_manager_, &media_observer_, kStreamId, kRenderFrameId,
@@ -392,7 +402,7 @@ class AudioOutputDelegateTest : public testing::Test {
EXPECT_CALL(mirroring_manager_, RemoveDiverter(NotNull()));
AudioOutputDelegate::UniquePtr delegate = AudioOutputDelegate::Create(
- &event_handler_, audio_manager_.get(),
+ &event_handler_, &stream_registry_, audio_manager_.get(),
log_factory_.CreateAudioLog(
media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER),
&mirroring_manager_, &media_observer_, kStreamId, kRenderFrameId,
@@ -414,7 +424,7 @@ class AudioOutputDelegateTest : public testing::Test {
EXPECT_CALL(mirroring_manager_, RemoveDiverter(NotNull()));
AudioOutputDelegate::UniquePtr delegate = AudioOutputDelegate::Create(
- &event_handler_, audio_manager_.get(),
+ &event_handler_, &stream_registry_, audio_manager_.get(),
log_factory_.CreateAudioLog(
media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER),
&mirroring_manager_, &media_observer_, kStreamId, kRenderFrameId,
@@ -439,7 +449,7 @@ class AudioOutputDelegateTest : public testing::Test {
EXPECT_CALL(mirroring_manager_, RemoveDiverter(NotNull()));
AudioOutputDelegate::UniquePtr delegate = AudioOutputDelegate::Create(
- &event_handler_, audio_manager_.get(),
+ &event_handler_, &stream_registry_, audio_manager_.get(),
log_factory_.CreateAudioLog(
media::AudioLogFactory::AUDIO_OUTPUT_CONTROLLER),
&mirroring_manager_, &media_observer_, kStreamId, kRenderFrameId,
@@ -463,6 +473,7 @@ class AudioOutputDelegateTest : public testing::Test {
StrictMock<MockAudioMirroringManager> mirroring_manager_;
StrictMock<MockEventHandler> event_handler_;
StrictMock<MockObserver> media_observer_;
+ MockAudioStreamRegistry stream_registry_;
media::FakeAudioLogFactory log_factory_;
private:
« no previous file with comments | « content/browser/renderer_host/media/audio_output_delegate.cc ('k') | content/browser/renderer_host/media/audio_renderer_host.h » ('j') | content/browser/renderer_host/media/audio_stream_registry_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698