Stop linking in the old Mojo EDK.

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 179de645dcfaa76ecc597d4c643d6ebae496b087..9baf3adc2f9846d811be1534eee7a8021884d0fe 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -837,12 +837,12 @@
       'dependencies': [
         '../mojo/mojo_base.gyp:mojo_application_base',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
+        '../mojo/mojo_edk.gyp:mojo_system_impl',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../storage/storage_common.gyp:storage_common',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
         '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../ui/accessibility/accessibility.gyp:ax_gen',
         '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
@@ -928,6 +928,7 @@
             '../media/midi/midi.gyp:midi',
             '../mojo/mojo_base.gyp:mojo_application_base',
             '../mojo/mojo_base.gyp:mojo_environment_chromium',
+            '../mojo/mojo_edk.gyp:mojo_common_test_support',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
             '../ppapi/ppapi_internal.gyp:ppapi_proxy',
             '../ppapi/ppapi_internal.gyp:ppapi_shared',
@@ -935,7 +936,6 @@
             '../storage/storage_browser.gyp:storage',
             '../storage/storage_common.gyp:storage_common',
             '../third_party/WebKit/public/blink.gyp:blink',
-            '../third_party/mojo/mojo_edk.gyp:mojo_common_test_support',
             '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
             '../ui/compositor/compositor.gyp:compositor_test_support',
             '../ui/surface/surface.gyp:surface',
@@ -1145,6 +1145,7 @@
             '../media/media.gyp:media_test_support',
             '../media/media.gyp:shared_memory_support',
             '../mojo/mojo_base.gyp:mojo_environment_chromium',
+            '../mojo/mojo_edk.gyp:mojo_common_test_support',
             '../net/net.gyp:net_extras',
             '../net/net.gyp:net_test_support',
             '../skia/skia.gyp:skia',
@@ -1158,7 +1159,6 @@
             '../third_party/icu/icu.gyp:icuuc',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/libjingle/libjingle.gyp:libjingle',
-            '../third_party/mojo/mojo_edk.gyp:mojo_common_test_support',
             '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
             '../third_party/re2/re2.gyp:re2',
             '../third_party/WebKit/public/blink.gyp:blink',
@@ -1461,6 +1461,8 @@
             '../mojo/mojo_base.gyp:mojo_application_base',
             '../mojo/mojo_base.gyp:mojo_environment_chromium',
             '../mojo/mojo_base.gyp:mojo_test_support',
+            '../mojo/mojo_edk.gyp:mojo_common_test_support',
+            '../mojo/mojo_edk.gyp:mojo_system_impl',
             '../net/net.gyp:net_test_support',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
             '../ppapi/ppapi_internal.gyp:ppapi_ipc',
@@ -1472,8 +1474,6 @@
             '../third_party/WebKit/public/blink.gyp:blink',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/mesa/mesa.gyp:osmesa',
-            '../third_party/mojo/mojo_edk.gyp:mojo_common_test_support',
-            '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
             '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
             '../third_party/mojo/mojo_public.gyp:mojo_js_bindings',
             '../third_party/zlib/zlib.gyp:zlib',