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

chrome/browser/profiles/profile_io_data.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #pragma once
 
 #include <set>
 #include "base/basictypes.h"
@@ skipping 16 matching lines @@
 class HostContentSettingsMap;
 class HostZoomMap;
 class IOThread;
 class Profile;
 class ProtocolHandlerRegistry;
 
 namespace fileapi {
 class FileSystemContext;
 }  // namespace fileapi
 
+namespace media_stream {
+class MediaStreamManager;
+}  // namespace media_stream
+
 namespace net {
 class CookieStore;
 class DnsCertProvenanceChecker;
 class HttpTransactionFactory;
 class NetLog;
 class ProxyConfigService;
 class ProxyService;
 class SSLConfigService;
 class TransportSecurityState;
 }  // namespace net
@@ skipping 211 matching lines @@
   mutable scoped_ptr<net::ProxyService> proxy_service_;
   mutable scoped_ptr<net::URLRequestJobFactory> job_factory_;
 
   // Pointed to by ResourceContext.
   mutable scoped_refptr<webkit_database::DatabaseTracker> database_tracker_;
   mutable scoped_refptr<ChromeAppCacheService> appcache_service_;
   mutable scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
   mutable scoped_refptr<fileapi::FileSystemContext> file_system_context_;
   mutable scoped_refptr<quota::QuotaManager> quota_manager_;
   mutable scoped_refptr<HostZoomMap> host_zoom_map_;
+  mutable scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
 
   // TODO(willchan): Remove from ResourceContext.
   mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
   mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   mutable DesktopNotificationService* notification_service_;
   mutable base::Callback<prerender::PrerenderManager*(void)>
       prerender_manager_getter_;
 
   mutable ResourceContext resource_context_;
 
   // These are only valid in between LazyInitialize() and their accessor being
   // called.
   mutable scoped_refptr<ChromeURLRequestContext> main_request_context_;
   mutable scoped_refptr<ChromeURLRequestContext> extensions_request_context_;
   // One AppRequestContext per isolated app.
   mutable AppRequestContextMap app_request_context_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_