Removing singleton property of MediaStreamManager and creating thread first when needed.

content/browser/resource_context.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/resource_context.h"
 
 #include "base/logging.h"
 #include "content/browser/browser_thread.h"
 #include "webkit/database/database_tracker.h"
 
 namespace content {
 
 ResourceContext::ResourceContext()
     : host_resolver_(NULL),
       request_context_(NULL),
       appcache_service_(NULL),
       database_tracker_(NULL),
       file_system_context_(NULL),
       blob_storage_context_(NULL),
       quota_manager_(NULL),
       host_zoom_map_(NULL),
-      media_observer_(NULL) {
+      media_observer_(NULL),
+      media_stream_manager_(NULL) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 ResourceContext::~ResourceContext() {}
 
 void* ResourceContext::GetUserData(const void* key) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   EnsureInitialized();
   UserDataMap::const_iterator found = user_data_.find(key);
   if (found != user_data_.end())
@@ skipping 105 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   EnsureInitialized();
   return media_observer_;
 }
 
 void ResourceContext::set_media_observer(MediaObserver* media_observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   media_observer_ = media_observer;
 }
 
+media_stream::MediaStreamManager*
+ResourceContext::media_stream_manager() const {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  EnsureInitialized();
+  return media_stream_manager_;
+}
+
+void ResourceContext::set_media_stream_manager(
+    media_stream::MediaStreamManager* media_stream_manager) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  media_stream_manager_ = media_stream_manager;
+}
+
 const base::Callback<prerender::PrerenderManager*(void)>&
 ResourceContext::prerender_manager_getter() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   EnsureInitialized();
   return prerender_manager_getter_;
 }
 
 void ResourceContext::set_prerender_manager_getter(
       const base::Callback<prerender::PrerenderManager*(void)>&
           prerender_manager_getter) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   prerender_manager_getter_ = prerender_manager_getter;
 }
 
 }  // namespace content