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

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

Issue 2697033006: Switching MediaStreamManager from using AudioManager to AudioSystem (Closed)
Patch Set: weak pointers removed Created 3 years, 9 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_input_renderer_host_unittest.cc
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc
index 7b843768dc83eceaf3143a915a6565c537545454..a8dffdb408b8200468a2d6d92901e0aa02844b64 100644
--- a/content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc
+++ b/content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc
@@ -24,6 +24,7 @@
#include "content/public/test/test_browser_thread.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "media/audio/audio_device_description.h"
+#include "media/audio/audio_system_impl.h"
#include "media/audio/fake_audio_log_factory.h"
#include "media/audio/fake_audio_manager.h"
#include "media/base/media_switches.h"
@@ -266,8 +267,9 @@ class AudioInputRendererHostTest : public testing::Test {
audio_manager_.reset(new media::FakeAudioManager(
base::ThreadTaskRunnerHandle::Get(),
base::ThreadTaskRunnerHandle::Get(), &log_factory_));
+ audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get());
media_stream_manager_ =
- base::MakeUnique<MediaStreamManager>(audio_manager_.get());
+ base::MakeUnique<MediaStreamManager>(audio_system_.get());
airh_ = new AudioInputRendererHostWithInterception(
kRenderProcessId, kRendererPid, media::AudioManager::Get(),
media_stream_manager_.get(), AudioMirroringManager::GetInstance(),
@@ -315,6 +317,7 @@ class AudioInputRendererHostTest : public testing::Test {
std::unique_ptr<MediaStreamManager> media_stream_manager_;
TestBrowserThreadBundle thread_bundle_;
media::ScopedAudioManagerPtr audio_manager_;
+ std::unique_ptr<media::AudioSystem> audio_system_;
StrictMock<MockRenderer> renderer_;
scoped_refptr<AudioInputRendererHost> airh_;

Powered by Google App Engine
This is Rietveld 408576698