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

Unified Diff: content/browser/renderer_host/media/media_stream_manager_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/media_stream_manager_unittest.cc
diff --git a/content/browser/renderer_host/media/media_stream_manager_unittest.cc b/content/browser/renderer_host/media/media_stream_manager_unittest.cc
index 89accb6450a39e584716a6985a84df9222becd02..e798e73ab8e9c1ab77d9ea15f53c08ae54e9d841 100644
--- a/content/browser/renderer_host/media/media_stream_manager_unittest.cc
+++ b/content/browser/renderer_host/media/media_stream_manager_unittest.cc
@@ -23,6 +23,7 @@
#include "content/public/common/content_switches.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/base/media_switches.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -166,7 +167,9 @@ class MediaStreamManagerTest : public ::testing::Test {
MediaStreamManagerTest()
: thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {
audio_manager_.reset(new MockAudioManager());
- media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
+ audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get());
+ media_stream_manager_ =
+ base::MakeUnique<MediaStreamManager>(audio_system_.get());
base::RunLoop().RunUntilIdle();
}
@@ -202,6 +205,7 @@ class MediaStreamManagerTest : public ::testing::Test {
std::unique_ptr<MediaStreamManager> media_stream_manager_;
content::TestBrowserThreadBundle thread_bundle_;
std::unique_ptr<MockAudioManager, media::AudioManagerDeleter> audio_manager_;
+ std::unique_ptr<media::AudioSystem> audio_system_;
base::RunLoop run_loop_;
private:

Powered by Google App Engine
This is Rietveld 408576698