diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-12 16:49:23 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-12 16:49:23 +0000 |
| commit | 1f99bc28b47392ed97d03863460bc681d7f39a1a (patch) | |
| tree | 7e8b989240415d3b6118d04a76a2b2f01958549a /content/browser/browser_main_loop.cc | |
| parent | 6b07fa26f4aa1a98e0aeb39c14ae6385d09e25a0 (diff) | |
| download | chromium_src-1f99bc28b47392ed97d03863460bc681d7f39a1a.zip chromium_src-1f99bc28b47392ed97d03863460bc681d7f39a1a.tar.gz chromium_src-1f99bc28b47392ed97d03863460bc681d7f39a1a.tar.bz2 | |
Revert "Remove dependencies on /media for iOS."
This reverts commit 5acb0a7605d1eec9220e0b7b3b663967fcf1e5ce.
We need to stop media_unittests running on the iOS simulator bot before we can
safely reland this CL.
TBR=bdibello
Review URL: https://codereview.chromium.org/19002008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_loop.cc')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index bfa4b77..577962d 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -403,7 +403,6 @@ void BrowserMainLoop::MainMessageLoopStart() { network_change_notifier_.reset(net::NetworkChangeNotifier::Create()); } -#if !defined(OS_IOS) { TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures") media::InitializeCPUSpecificMediaFeatures(); @@ -416,6 +415,8 @@ void BrowserMainLoop::MainMessageLoopStart() { TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager") midi_manager_.reset(media::MIDIManager::Create()); } + +#if !defined(OS_IOS) { TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController") WebUIControllerFactory::RegisterFactory( |