Revert "Revert "Remove dependencies on /media for iOS.""

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index e0ad6fac647cd4a5c4676a53350aa92a31fc3981..2c1e640f0caa7698cd65371675823035ce66e35f 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -21,7 +21,6 @@
         '../components/components.gyp:sessions_test_support',
         '../content/content.gyp:content_app_both',
         '../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,6 +304,7 @@
             '../content/content.gyp:content_worker',
             '../components/components.gyp:autofill_core_test_support',
             '../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',
@@ -456,7 +456,6 @@
         # 2) test-specific support libraries:
         '../base/base.gyp:test_support_base',
         '../content/content.gyp:content_app_both',
-        '../media/media.gyp:media_test_support',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../sync/sync.gyp:test_support_sync_api',
@@ -1977,6 +1976,7 @@
             '../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',