summaryrefslogtreecommitdiffstats
path: root/content/browser/browser_main_loop.cc
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser/browser_main_loop.cc')
-rw-r--r--content/browser/browser_main_loop.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 912f7e8..9b84ee5 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -351,7 +351,6 @@ void BrowserMainLoop::MainMessageLoopStart() {
}
online_state_observer_.reset(new BrowserOnlineStateObserver);
- media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
// Prior to any processing happening on the io thread, we create the
// plugin service as it is predominantly used from the io thread,
@@ -672,6 +671,9 @@ void BrowserMainLoop::BrowserThreadsStarted() {
// RDH needs the IO thread to be created.
resource_dispatcher_host_.reset(new ResourceDispatcherHostImpl());
+ // MediaStreamManager needs the IO thread to be created.
+ media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
+
// Initialize the GpuDataManager before we set up the MessageLoops because
// otherwise we'll trigger the assertion about doing IO on the UI thread.
GpuDataManagerImpl::GetInstance()->Initialize();