Move //mojo/{public, edk} underneath //third_party

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 00630f845fd4effd6e5d990878ba59a3b805bd17..3b0ee341d0d022f71f0b60bc9cdd76ea4f421571 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -769,12 +769,12 @@
       'type': 'static_library',
       'dependencies': [
         '../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',
         '../ui/accessibility/accessibility.gyp:ax_gen',
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/base/ui_base.gyp:ui_base_test_support',
@@ -959,14 +959,14 @@
         '../device/battery/battery.gyp:device_battery',
         '../device/battery/battery.gyp:device_battery_mojo_bindings',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_edk.gyp:mojo_common_test_support',
-        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../sql/sql.gyp:sql',
         '../sql/sql.gyp:test_support_sql',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../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',
         '../ui/accessibility/accessibility.gyp:accessibility',
         '../ui/base/ui_base.gyp:ui_base',
@@ -1280,14 +1280,14 @@
           'target_name': 'web_ui_test_mojo_bindings',
           'type': 'static_library',
           'dependencies': [
-            '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+            '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
           ],
           'sources': [
             'test/data/web_ui_test_mojo_bindings.mojom',
           ],
-          'includes': [ '../mojo/mojom_bindings_generator.gypi' ],
+          'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
           'export_dependent_settings': [
-            '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+            '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
           ],
         },
         {
@@ -1315,10 +1315,6 @@
             '../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',
-            '../mojo/mojo_edk.gyp:mojo_system_impl',
-            '../mojo/mojo_public.gyp:mojo_cpp_bindings',
-            '../mojo/mojo_public.gyp:mojo_js_bindings',
             '../net/net.gyp:net_test_support',
             '../ppapi/ppapi_internal.gyp:ppapi_host',
             '../ppapi/ppapi_internal.gyp:ppapi_ipc',
@@ -1330,6 +1326,10 @@
             '../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',
             '../ui/accessibility/accessibility.gyp:accessibility',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
@@ -1947,10 +1947,10 @@
             '../device/battery/battery.gyp:device_battery_javatests',
             '../media/media.gyp:media_java',
             '../media/media.gyp:media_test_support',
-            '../mojo/mojo_public.gyp:mojo_public_test_interfaces',
             '../net/net.gyp:net_java',
             '../net/net.gyp:net_javatests',
             '../net/net.gyp:net_java_test_support',
+            '../third_party/mojo/mojo_public.gyp:mojo_public_test_interfaces',
           ],
           'variables': {
             'apk_name': 'ContentShellTest',