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: http://src.chromium.org/svn/trunk/src/build@211411 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

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',