Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1071)

Unified Diff: content/content_tests.gypi

Issue 18777006: Remove dependencies on /media for iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_common.gypi ('k') | content/public/test/content_test_suite_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index e2f390e628864612289a3e80fc4ffcec0f5cba00..1d7e656f1e848e5c9541ed0a3da49c708acd56e3 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -9,7 +9,6 @@
'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',
@@ -165,6 +164,7 @@
'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',
@@ -251,7 +251,6 @@
'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',
@@ -572,6 +571,7 @@
'../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',
« no previous file with comments | « content/content_common.gypi ('k') | content/public/test/content_test_suite_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698