Move mojo/edk gyp targets in to mojo/edk/mojo_edk.gyp

content/content_tests.gypi

 # Copyright (c) 2013 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.
 
 {
   'variables': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 1101 matching lines @@
             'content_shell_lib',
             'content_shell_pak',
             'test_support_content',
             'web_ui_test_mojo_bindings',
             '../base/base.gyp:test_support_base',
             '../gin/gin.gyp:gin',
             '../gpu/gpu.gyp:gpu',
             '../ipc/ipc.gyp:test_support_ipc',
             '../media/media.gyp:media_test_support',
             '../media/media.gyp:shared_memory_support',
-            '../mojo/mojo_base.gyp:mojo_common_test_support',
+            '../mojo/edk/mojo_edk.gyp:mojo_common_test_support',
+            '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
             '../mojo/mojo_base.gyp:mojo_environment_chromium',
-            '../mojo/mojo_base.gyp:mojo_system_impl',
             '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
             '../mojo/public/mojo_public.gyp:mojo_js_bindings',
             '../net/net.gyp:net_test_support',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
             '../ppapi/ppapi_internal.gyp:ppapi_ipc',
             '../ppapi/ppapi_internal.gyp:ppapi_proxy',
             '../ppapi/ppapi_internal.gyp:ppapi_shared',
             '../ppapi/ppapi_internal.gyp:ppapi_tests',
             '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
             '../testing/gmock.gyp:gmock',
@@ skipping 788 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }