diff options
| author | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-14 17:59:46 +0000 |
|---|---|---|
| committer | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-14 17:59:46 +0000 |
| commit | cba890e40291c245a53ce4297619659458ce4138 (patch) | |
| tree | 67a239e1d3bfe8d2ae35c38872e141a5597ea379 /chrome/browser/profiles/profile_io_data.h | |
| parent | f35205e4dc5551727836cbddc0bc01e0596f7972 (diff) | |
| download | chromium_src-cba890e40291c245a53ce4297619659458ce4138.zip chromium_src-cba890e40291c245a53ce4297619659458ce4138.tar.gz chromium_src-cba890e40291c245a53ce4297619659458ce4138.tar.bz2 | |
Revert 101063 - Removing singleton property of MediaStreamManager and creating thread first when needed.
Most likely cause of new Flakiness in PrerenderBrowserTest.PrerenderUnload...
BUG=92125
TEST=
Review URL: http://codereview.chromium.org/7649016
TBR=mflodman@chromium.org
Review URL: http://codereview.chromium.org/7885034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101107 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles/profile_io_data.h')
| -rw-r--r-- | chrome/browser/profiles/profile_io_data.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h index 3a6f2fc..760a06d 100644 --- a/chrome/browser/profiles/profile_io_data.h +++ b/chrome/browser/profiles/profile_io_data.h @@ -34,10 +34,6 @@ namespace fileapi { class FileSystemContext; } // namespace fileapi -namespace media_stream { -class MediaStreamManager; -} // namespace media_stream - namespace net { class CookieStore; class DnsCertProvenanceChecker; @@ -285,7 +281,6 @@ class ProfileIOData { 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_; |