Revert "Remove dependencies on /media for iOS."

chrome/chrome_tests_unit.gypi

 # Copyright 2012 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.
 {
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
       'dependencies': [
         # NOTE: New dependencies should generally be added in the OS!="ios"
         # dependencies block below, rather than here.
         'app/policy/cloud_policy_codegen.gyp:policy_test_support',
         'browser',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'chrome_resources.gyp:theme_resources',
         'common',
         '../base/base.gyp:test_support_base',
         '../base/base.gyp:base_prefs_test_support',
         '../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',
         '../sync/sync.gyp:sync',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/zlib/zlib.gyp:zlib',
       ],
       'export_dependent_settings': [
         'app/policy/cloud_policy_codegen.gyp:policy_test_support',
@@ skipping 263 matching lines @@
             'plugin',
             'renderer',
             'utility',
             '../content/content.gyp:content_gpu',
             '../content/content.gyp:content_plugin',
             '../content/content.gyp:content_ppapi_plugin',
             '../content/content.gyp:content_renderer',
             '../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',
           ],
           'export_dependent_settings': [
             'renderer',
           ],
         }, {  # OS=="ios"
           'sources/': [
             # Exclude everything but iOS-specific files.
@@ skipping 116 matching lines @@
       'type': '<(gtest_target_type)',
       'dependencies': [
         # NOTE: New dependencies should generally be added in the OS!="ios"
         # dependencies block below, rather than here.
         # Unit tests should only depend on:
         # 1) everything that the chrome binaries depend on:
         '<@(chromium_browser_dependencies)',
         '<@(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',
         '../sync/sync.gyp:test_support_sync_core',
         '../sync/sync.gyp:test_support_sync_internal_api',
         '../sync/sync.gyp:test_support_sync_notifier',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         'test_support_common',
         'test_support_unit',
@@ skipping 1451 matching lines @@
         '../webkit/browser/quota/mock_storage_client.h',
       ],
       'conditions': [
         ['OS!="ios"', {
           'dependencies': [
             'common/extensions/api/api.gyp:api',
             '../components/components.gyp:autofill_content_test_util',
             '../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',
             '../third_party/libjingle/libjingle.gyp:libjingle',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
             '../tools/json_schema_compiler/test/json_schema_compiler_tests.gyp:json_schema_compiler_tests',
             '../ui/gl/gl.gyp:gl',
             '../v8/tools/gyp/v8.gyp:v8',
             '../webkit/plugins/webkit_plugins.gyp:test_mock_plugin_list',
             '../webkit/webkit_resources.gyp:webkit_resources',
@@ skipping 726 matching lines @@
               # more details.
               'DebugInformationFormat': '3',
               'ProgramDataBaseFileName': '<(PRODUCT_DIR)/unit_tests.exe.pdb',
             },
           },
         },
       ],
     }],
   ],  # 'conditions'
 }