Move third_party/mojo/src/mojo/public to mojo/public

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 2eb0e097836f4180486369be503d59464342f1a4..68f3b8b3d78042bb5a03aeaa62853578d44c142f 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -823,7 +823,7 @@
         '../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',
+        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../ui/accessibility/accessibility.gyp:ax_gen',
         '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
         '../ui/base/ui_base.gyp:ui_base',
@@ -915,7 +915,7 @@
             '../storage/storage_browser.gyp:storage',
             '../storage/storage_common.gyp:storage_common',
             '../third_party/WebKit/public/blink.gyp:blink',
-            '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+            '../mojo/mojo_public.gyp:mojo_cpp_bindings',
             '../ui/compositor/compositor.gyp:compositor_test_support',
             '../ui/surface/surface.gyp:surface',
             '../v8/tools/gyp/v8.gyp:v8',
@@ -1138,7 +1138,7 @@
             '../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',
+            '../mojo/mojo_public.gyp:mojo_cpp_bindings',
             '../third_party/re2/re2.gyp:re2',
             '../third_party/WebKit/public/blink.gyp:blink',
             '../ui/accessibility/accessibility.gyp:accessibility',
@@ -1386,21 +1386,21 @@
           'sources': [
             'public/test/test_mojo_service.mojom',
           ],
-          'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
+          'includes': [ '../mojo/mojom_bindings_generator.gypi' ],
         },
         {
           # GN version: //content/test:web_ui_test_mojo_bindings
           'target_name': 'web_ui_test_mojo_bindings',
           'type': 'static_library',
           'dependencies': [
-            '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+            '../mojo/mojo_public.gyp:mojo_cpp_bindings',
           ],
           'sources': [
             'test/data/web_ui_test_mojo_bindings.mojom',
           ],
-          'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
+          'includes': [ '../mojo/mojom_bindings_generator.gypi' ],
           'export_dependent_settings': [
-            '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+            '../mojo/mojo_public.gyp:mojo_cpp_bindings',
           ],
         },
         {
@@ -1445,8 +1445,8 @@
             '../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',
+            '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+            '../mojo/mojo_public.gyp:mojo_js_bindings',
             '../third_party/zlib/zlib.gyp:zlib',
             '../ui/accessibility/accessibility.gyp:accessibility',
             '../ui/base/ui_base.gyp:ui_base',
@@ -2110,7 +2110,7 @@
             '../net/net.gyp:net_java_test_support',
             '../testing/android/on_device_instrumentation.gyp:broker_java',
             '../testing/android/on_device_instrumentation.gyp:require_driver_apk',
-            '../third_party/mojo/mojo_public.gyp:mojo_public_test_interfaces',
+            '../mojo/mojo_public.gyp:mojo_public_test_interfaces',
           ],
           'variables': {
             'apk_name': 'ContentShellTest',