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

9 files changed, 13 insertions, 20 deletions

diff --git a/build/all.gyp b/build/all.gyp
index 3a0858a..3818816 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -14,6 +14,7 @@
         '../chrome/chrome.gyp:*',
         '../content/content.gyp:*',
         '../crypto/crypto.gyp:*',
+        '../media/media.gyp:*',
         '../net/net.gyp:*',
         '../sdch/sdch.gyp:*',
         '../sql/sql.gyp:*',
@@ -40,7 +41,6 @@
             '../gpu/tools/tools.gyp:*',
             '../ipc/ipc.gyp:*',
             '../jingle/jingle.gyp:*',
-            '../media/media.gyp:*',
             '../ppapi/ppapi.gyp:*',
             '../ppapi/ppapi_internal.gyp:*',
             '../printing/printing.gyp:*',
@@ -207,6 +207,7 @@
         '../base/base.gyp:base_unittests',
         '../chrome/chrome.gyp:unit_tests',
         '../crypto/crypto.gyp:crypto_unittests',
+        '../media/media.gyp:media_unittests',
         '../net/net.gyp:net_unittests',
         '../sql/sql.gyp:sql_unittests',
         '../ui/ui.gyp:ui_unittests',
@@ -231,7 +232,6 @@
             '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support',
             '../ipc/ipc.gyp:ipc_tests',
             '../jingle/jingle.gyp:jingle_unittests',
-            '../media/media.gyp:media_unittests',
             '../ppapi/ppapi_internal.gyp:ppapi_unittests',
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index eed36e8..1da86c4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -39,6 +39,7 @@
         '../crypto/crypto.gyp:crypto',
         '../google_apis/google_apis.gyp:google_apis',
         '../jingle/jingle.gyp:notifier',
+        '../media/media.gyp:media',
         '../skia/skia.gyp:skia',
         '../sql/sql.gyp:sql',
         '../sync/sync.gyp:sync',
@@ -2393,7 +2394,6 @@
             '../cc/cc.gyp:cc',
             '../components/components.gyp:autofill_content_browser',
             '../components/components.gyp:navigation_interception',
-            '../media/media.gyp:media',
             '../net/net.gyp:net_with_v8',
             '../printing/printing.gyp:printing',
             '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 1259510..70bc087 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -34,6 +34,7 @@
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../crypto/crypto.gyp:crypto',
+        '../media/media.gyp:media',
         '../skia/skia.gyp:skia',
         '../sync/sync.gyp:sync',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
@@ -2387,7 +2388,6 @@
             '../components/components.gyp:autofill_content_risk_proto',
             '../components/component_strings.gyp:component_strings',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
-            '../media/media.gyp:media',
             '../net/net.gyp:net_with_v8',
             '../printing/printing.gyp:printing',
             '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 525f35d..babd1da 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3117,6 +3117,7 @@
             # Disabling for now (enabled on linux/windows below).
             # 'browser_tests',
             '../ipc/ipc.gyp:ipc_tests',
+            '../media/media.gyp:media_unittests',
             '../net/net.gyp:net_unittests',
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
@@ -3126,10 +3127,6 @@
             '../sync/sync.gyp:sync_unit_tests',
           ],  # 'dependencies'
           'conditions': [
-            ['OS!="ios"', {
-              'dependencies': [
-                '../media/media.gyp:media_unittests',
-              ]}],
             ['OS=="win"', {
               'dependencies': [
                 # Courgette has not been ported from Windows.
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 285965c..d1f05ae 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -22,6 +22,7 @@
         '../components/components.gyp:sessions_test_support',
         '../content/content.gyp:content_app',
         '../content/content.gyp:test_support_content',
+        '../media/media.gyp:media_test_support',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
@@ -305,7 +306,6 @@
             '../content/content.gyp:content_utility',
             '../content/content.gyp:content_worker',
             '../ipc/ipc.gyp:test_support_ipc',
-            '../media/media.gyp:media_test_support',
             '../ppapi/ppapi_internal.gyp:ppapi_shared',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../webkit/support/webkit_support.gyp:glue_child',
@@ -442,6 +442,7 @@
         '<@(chromium_child_dependencies)',
         # 2) test-specific support libraries:
         '../base/base.gyp:test_support_base',
+        '../media/media.gyp:media_test_support',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../sync/sync.gyp:test_support_sync_api',
@@ -1913,7 +1914,6 @@
             '../components/component_strings.gyp:component_strings',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
             '../gpu/gpu.gyp:gpu_unittest_utils',
-            '../media/media.gyp:media_test_support',
             '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
             '../third_party/cld/cld.gyp:cld',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
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(
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 180b239..8cf2c66 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -6,6 +6,7 @@
   'dependencies': [
     '../base/base.gyp:base',
     '../components/tracing.gyp:tracing',
+    '../media/media.gyp:media',
     '../net/net.gyp:net',
     '../skia/skia.gyp:skia',
     '../third_party/icu/icu.gyp:icuuc',
@@ -375,7 +376,6 @@
         '../gpu/gpu.gyp:gles2_implementation',
         '../gpu/gpu.gyp:gpu_ipc',
         '../ipc/ipc.gyp:ipc',
-        '../media/media.gyp:media',
         '../media/media.gyp:shared_memory_support',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../ui/gl/gl.gyp:gl',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 608cc48..0b14921 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -9,6 +9,7 @@
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
+        '../media/media.gyp:media',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
@@ -168,7 +169,6 @@
             'content_ppapi_plugin',
             'content_utility',
             'content_worker',
-            '../media/media.gyp:media',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
             '../ppapi/ppapi_internal.gyp:ppapi_proxy',
             '../ppapi/ppapi_internal.gyp:ppapi_shared',
@@ -255,6 +255,7 @@
         'browser/speech/proto/speech_proto.gyp:speech_proto',
         '../base/base.gyp:test_support_base',
         '../crypto/crypto.gyp:crypto',
+        '../media/media.gyp:media_test_support',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../sql/sql.gyp:sql',
@@ -576,7 +577,6 @@
             '../gpu/gpu.gyp:gpu_unittest_utils',
             '../ipc/ipc.gyp:test_support_ipc',
             '../jingle/jingle.gyp:jingle_glue_test_util',
-            '../media/media.gyp:media_test_support',
             '../media/media.gyp:shared_memory_support',
             '../third_party/WebKit/public/blink.gyp:blink',
             '../third_party/icu/icu.gyp:icui18n',
diff --git a/content/public/test/content_test_suite_base.cc b/content/public/test/content_test_suite_base.cc
index a33c14a..459c37d 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -13,6 +13,7 @@
 #include "content/common/url_schemes.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_paths.h"
+#include "media/base/media.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/compositor/compositor_setup.h"
@@ -28,10 +29,6 @@
 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
 #endif
 
-#if !defined(OS_IOS)
-#include "media/base/media.h"
-#endif
-
 namespace content {
 
 class ContentTestSuiteBaseListener : public testing::EmptyTestEventListener {
@@ -64,10 +61,8 @@ void ContentTestSuiteBase::Initialize() {
   ui::shell_dialogs::RegisterJni(env);
 #endif
 
-#if !defined(OS_IOS)
   if (external_libraries_enabled_)
     media::InitializeMediaLibraryForTesting();
-#endif
 
   scoped_ptr<ContentClient> client_for_init(CreateClientForInitialization());
   SetContentClient(client_for_init.get());