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

Unified Diff: content/browser/renderer_host/media/media_devices_dispatcher_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/media_devices_dispatcher_host_unittest.cc
diff --git a/content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc
index c999cc0f6415d4112bb9b6aee18375e07bfc0bd6..c907d5ff8cd3dc476b673b56cd928e285299fd28 100644
--- a/content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc
+++ b/content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc
@@ -25,6 +25,7 @@
#include "content/public/test/test_browser_context.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/mock_audio_manager.h"
#include "media/base/media_switches.h"
#include "media/capture/video/fake_video_capture_device_factory.h"
@@ -81,7 +82,9 @@ class MediaDevicesDispatcherHostTest : public testing::Test {
kNumFakeVideoDevices, kDefaultVideoDeviceID));
audio_manager_.reset(
new media::MockAudioManager(base::ThreadTaskRunnerHandle::Get()));
- 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());
MockResourceContext* mock_resource_context =
static_cast<MockResourceContext*>(
@@ -286,6 +289,7 @@ class MediaDevicesDispatcherHostTest : public testing::Test {
std::unique_ptr<media::AudioManager, media::AudioManagerDeleter>
audio_manager_;
+ std::unique_ptr<media::AudioSystem> audio_system_;
content::TestBrowserContext browser_context_;
MediaDeviceEnumeration physical_devices_;
url::Origin origin_;

Powered by Google App Engine
This is Rietveld 408576698