Index: content/browser/renderer_host/media/video_capture_host_unittest.cc |
diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc |
index a5f567060873b12f4354d52b0a452b6138b36eca..933c58ddc750a5f7c088e5cfbd26fff95fb254aa 100644 |
--- a/content/browser/renderer_host/media/video_capture_host_unittest.cc |
+++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc |
@@ -274,7 +274,7 @@ |
#endif |
// Create our own MediaStreamManager. |
- audio_manager_ = media::AudioManager::CreateForTesting(task_runner_); |
+ audio_manager_.reset(media::AudioManager::CreateForTesting()); |
#ifndef TEST_REAL_CAPTURE_DEVICE |
base::CommandLine::ForCurrentProcess()->AppendSwitch( |
switches::kUseFakeDeviceForMediaStream); |
@@ -483,13 +483,10 @@ |
scoped_refptr<MockVideoCaptureHost> host_; |
private: |
- // media_stream_manager_ needs to outlive thread_bundle_ because it is a |
- // MessageLoop::DestructionObserver. audio_manager_ needs to outlive |
- // thread_bundle_ because it uses the underlying message loop. |
StrictMock<MockMediaStreamRequester> stream_requester_; |
+ std::unique_ptr<media::AudioManager> audio_manager_; |
std::unique_ptr<MediaStreamManager> media_stream_manager_; |
content::TestBrowserThreadBundle thread_bundle_; |
- media::ScopedAudioManagerPtr audio_manager_; |
content::TestBrowserContext browser_context_; |
content::TestContentBrowserClient browser_client_; |
scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |