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

mojo/mojo_base.gyp

Index: mojo/mojo_base.gyp
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp
index 3187a98109b8a0dce387c397e63d1260e5458e09..b7b7837b2b6c8cecaee6c508145605273ed84415 100644
--- a/mojo/mojo_base.gyp
+++ b/mojo/mojo_base.gyp
@@ -7,7 +7,7 @@
 # Mojo land like mojo_shell should be in mojo.gyp.
 {
   'includes': [
-    '../third_party/mojo/mojo_variables.gypi',
+    'mojo_variables.gypi',
   ],
   'targets': [
     {
@@ -25,8 +25,8 @@
       'conditions': [
         ['OS == "android"', {
           'dependencies': [
-            '../third_party/mojo/mojo_public.gyp:mojo_bindings_java',
-            '../third_party/mojo/mojo_public.gyp:mojo_public_java',
+            '../mojo/mojo_public.gyp:mojo_bindings_java',
+            '../mojo/mojo_public.gyp:mojo_public_java',
           ],
         }],
       ]
@@ -133,8 +133,8 @@
         '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
         '../third_party/mojo/mojo_edk.gyp:mojo_common_test_support',
         '../third_party/mojo/mojo_edk.gyp:mojo_run_all_unittests',
-        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
-        '../third_party/mojo/mojo_public.gyp:mojo_public_test_utils',
+        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../mojo/mojo_public.gyp:mojo_public_test_utils',
         'mojo_common_lib',
         'mojo_environment_chromium',
         'mojo_message_pump_lib',
@@ -152,28 +152,22 @@
       'type': 'static_library',
       'dependencies': [
         'mojo_environment_chromium_impl',
-        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'sources': [
         # TODO(vtl): This is kind of ugly. (See TODO in logging.h.)
-        "../third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h",
-        "../third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc",
-        "../third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc",
-        "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.cc",
-        "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tracking.cc",
-        "../third_party/mojo/src/mojo/public/cpp/environment/logging.h",
-        "../third_party/mojo/src/mojo/public/cpp/environment/task_tracker.h",
         'environment/environment.cc',
+        "public/cpp/environment/async_waiter.h",
+        "public/cpp/environment/lib/async_waiter.cc",
+        "public/cpp/environment/lib/logging.cc",
+        "public/cpp/environment/lib/scoped_task_tracking.cc",
+        "public/cpp/environment/lib/scoped_task_tracking.cc",
+        "public/cpp/environment/logging.h",
+        "public/cpp/environment/task_tracker.h",
       ],
       'include_dirs': [
         '..',
-        '../third_party/mojo/src',
       ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../third_party/mojo/src',
-        ],
-      },
       'export_dependent_settings': [
         'mojo_environment_chromium_impl',
       ],
@@ -203,13 +197,7 @@
       ],
       'include_dirs': [
         '..',
-        '../third_party/mojo/src',
       ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../third_party/mojo/src',
-        ],
-      },
     },
     {
       'target_name': 'mojo_application_bindings_mojom',
@@ -228,7 +216,7 @@
       'export_dependent_settings': [
         'mojo_services.gyp:network_service_bindings_generation',
       ],
-      'includes': [ '../third_party/mojo/mojom_bindings_generator_explicit.gypi' ],
+      'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
     },
     {
       # GN version: //mojo/application/public/cpp
@@ -262,13 +250,13 @@
       ],
     },
     {
-      # GN version: //mojo/public/interfaces/application:application
+      # GN version:public/interfaces/application:application
       'target_name': 'mojo_application_bindings',
       'type': 'static_library',
       'dependencies': [
         'mojo_application_bindings_mojom',
         'mojo_services.gyp:network_service_bindings_lib',
-        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_services.gyp:network_service_bindings_lib',
@@ -296,8 +284,8 @@
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         '../third_party/mojo/mojo_edk.gyp:mojo_run_all_unittests',
-        '../third_party/mojo/mojo_public.gyp:mojo_utility',
-        '../third_party/mojo/mojo_public.gyp:mojo_environment_standalone',
+        '../mojo/mojo_public.gyp:mojo_utility',
+        '../mojo/mojo_public.gyp:mojo_environment_standalone',
       ],
       'sources': [
         'application/public/cpp/tests/service_registry_unittest.cc',
@@ -354,7 +342,7 @@
           'dependencies': [
             '../base/base.gyp:base_java',
             'libmojo_system_java',
-            '../third_party/mojo/mojo_public.gyp:mojo_public_java',
+            '../mojo/mojo_public.gyp:mojo_public_java',
           ],
           'variables': {
             'java_in_dir': '<(DEPTH)/mojo/android/system',