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

This CL move //mojo/public and //mojo/edk to live in the following locations:
- //third_party/mojo/src/mojo/public
- //third_party/mojo/src/mojo/edk

It moves the related gypfiles from //mojo to //third_party/mojo and updates
them as necessary to account for the file moves. It also updates clients of the
mojo SDK and EDK targets in both GYP and GN. (Note that for GN, the mojo SDK
and EDK build systems are maintained in the Mojo repo and designed to be
flexible wrt the location of the SDK/EDK in a client repo, so no changes are
needed.

This CL does not update include paths to the code being moved to limit the
number of moving parts, instead relying on the include_dirs that the SDK and
EDK targets supply to their direct dependents to ensure that include paths
continue to resolve correctly.

NOPRESUBMIT=true

Review URL: https://codereview.chromium.org/814543006

Cr-Commit-Position: refs/heads/master@{#312129}

893 files changed, 1124 insertions, 1042 deletions

diff --git a/DEPS b/DEPS
index 1644548..18c8f76 100644
--- a/DEPS
+++ b/DEPS
@@ -738,8 +738,8 @@ hooks = [
     'name': 'download_mojo_shell',
     'pattern': '',
     'action': [ 'python',
-                'src/mojo/public/tools/download_shell_binary.py',
-                '--tools-directory=../../../tools',
+                'src/third_party/mojo/src/mojo/public/tools/download_shell_binary.py',
+                '--tools-directory=../../../../../../tools',
               ],
   },
   {
diff --git a/android_webview/java_library_common.mk b/android_webview/java_library_common.mk
index ee38951..194abd2 100644
--- a/android_webview/java_library_common.mk
+++ b/android_webview/java_library_common.mk
@@ -22,8 +22,8 @@ LOCAL_SRC_FILES += \
     $(call all-java-files-under, ../device/battery/android/java/src) \
     $(call all-java-files-under, ../media/base/android/java/src) \
     $(call all-java-files-under, ../mojo/android/system/src) \
-    $(call all-java-files-under, ../mojo/public/java/bindings/src) \
-    $(call all-java-files-under, ../mojo/public/java/system/src) \
+    $(call all-java-files-under, ../third_party/mojo/src/mojo/public/java/bindings/src) \
+    $(call all-java-files-under, ../third_party/mojo/src/mojo/public/java/system/src) \
     $(call all-java-files-under, ../net/android/java/src) \
     $(call all-java-files-under, ../ui/android/java/src) \
     $(call all-java-files-under, ../third_party/eyesfree/src/android/java/src) \
diff --git a/build/all.gyp b/build/all.gyp
index d6ff3ec..f7b46cd 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -51,17 +51,17 @@
             # javascript-related targets cause v8 to be built.
             '../mojo/mojo_base.gyp:mojo_common_lib',
             '../mojo/mojo_base.gyp:mojo_common_unittests',
-            '../mojo/mojo_edk.gyp:mojo_system_impl',
-            '../mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittests',
-            '../mojo/mojo_edk_tests.gyp:mojo_public_environment_unittests',
-            '../mojo/mojo_edk_tests.gyp:mojo_public_system_perftests',
-            '../mojo/mojo_edk_tests.gyp:mojo_public_system_unittests',
-            '../mojo/mojo_edk_tests.gyp:mojo_public_utility_unittests',
-            '../mojo/mojo_edk_tests.gyp:mojo_system_unittests',
-            '../mojo/mojo_public.gyp:mojo_cpp_bindings',
-            '../mojo/mojo_public.gyp:mojo_public_test_utils',
-            '../mojo/mojo_public.gyp:mojo_system',
             '../google_apis/google_apis.gyp:google_apis_unittests',
+            '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+            '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittests',
+            '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_environment_unittests',
+            '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_perftests',
+            '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests',
+            '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittests',
+            '../third_party/mojo/mojo_edk_tests.gyp:mojo_system_unittests',
+            '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+            '../third_party/mojo/mojo_public.gyp:mojo_public_test_utils',
+            '../third_party/mojo/mojo_public.gyp:mojo_system',
             '../ui/base/ui_base_tests.gyp:ui_base_unittests',
             '../ui/ios/ui_ios_tests.gyp:ui_ios_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
diff --git a/build/get_landmines.py b/build/get_landmines.py
index 5fdb1ba..ac3d7d6 100755
--- a/build/get_landmines.py
+++ b/build/get_landmines.py
@@ -53,6 +53,7 @@ def print_landmines():
   if (platform() != 'ios'):
     print 'Clobber to get rid of obselete test plugin after r248358'
     print 'Clobber to rebuild GN files for V8'
+  print 'Clobber to get rid of stale generated mojom.h files'
   print 'Need to clobber everything due to build_nexe change in nacl r13424'
   print '[chromium-dev] PSA: clobber build needed for IDR_INSPECTOR_* compil...'
   print 'blink_resources.grd changed: crbug.com/400860'
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index d210d1c..0d9f2d1 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -242,10 +242,7 @@ static_library("browser") {
       "//content/app/resources",
       "//media",
       "//mojo/common",
-      "//mojo/edk/system",
       "//mojo/environment:chromium",
-      "//mojo/public/cpp/bindings",
-      "//mojo/public/js",
       "//net:extras",
       "//net:net_with_v8",
       "//storage/browser",
@@ -255,6 +252,9 @@ static_library("browser") {
       "//third_party/leveldatabase",
       "//third_party/libaddressinput",
       "//third_party/libyuv",
+      "//third_party/mojo/src/mojo/edk/system",
+      "//third_party/mojo/src/mojo/public/cpp/bindings",
+      "//third_party/mojo/src/mojo/public/js",
       "//third_party/npapi",
       "//third_party/re2",
       "//third_party/smhasher:cityhash",
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 006c2b5..a1173ae 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -100,7 +100,6 @@ static_library("ui") {
       "//components/power",
       "//device/nfc",
       "//media",
-      "//mojo/edk/system",
       "//net:net_with_v8",
       "//storage/browser",
       "//storage/common",
@@ -109,6 +108,7 @@ static_library("ui") {
       "//third_party/expat",
       "//third_party/hunspell",
       "//third_party/leveldatabase",
+      "//third_party/mojo/src/mojo/edk/system",
       "//third_party/npapi",
       "//third_party/libjingle",
       "//third_party/re2",
diff --git a/chrome/browser/ui/webui/omnibox/BUILD.gn b/chrome/browser/ui/webui/omnibox/BUILD.gn
index a281580..21613cb 100644
--- a/chrome/browser/ui/webui/omnibox/BUILD.gn
+++ b/chrome/browser/ui/webui/omnibox/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 # GYP version: chrome/chrome_web_ui_mojo_bindings.gyp:webui_mojo_bindings
 mojom("mojo_bindings") {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index bc6fe60..935c194 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3001,9 +3001,6 @@
             '../media/media.gyp:media',
             '../mojo/mojo_base.gyp:mojo_common_lib',
             '../mojo/mojo_base.gyp:mojo_environment_chromium',
-            '../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_extras',
             '../net/net.gyp:net_with_v8',
             '../storage/storage_browser.gyp:storage',
@@ -3014,6 +3011,9 @@
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
             '../third_party/libyuv/libyuv.gyp:libyuv',
+            '../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/npapi/npapi.gyp:npapi',
             '../third_party/smhasher/smhasher.gyp:cityhash',
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index aba1896..dcba30c 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2725,13 +2725,13 @@
             '../components/components.gyp:translate_content_common',
             '../content/app/resources/content_resources.gyp:content_resources',
             '../media/media.gyp:media',
-            '../mojo/mojo_edk.gyp:mojo_system_impl',
             '../net/net.gyp:net_with_v8',
             '../storage/storage_browser.gyp:storage',
             '../storage/storage_common.gyp:storage_common',
             '../third_party/expat/expat.gyp:expat',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/libjingle/libjingle.gyp:libjingle',
+            '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
             '../third_party/npapi/npapi.gyp:npapi',
             '../third_party/re2/re2.gyp:re2',
             '../ui/compositor/compositor.gyp:compositor',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 56a55e1..6185823 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2018,11 +2018,11 @@
         'test_support_common',
         '../base/base.gyp:base',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_edk.gyp:mojo_system_impl',
         '../skia/skia.gyp:skia',
         '../sync/sync.gyp:sync',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
       ],
       'include_dirs': [
         '..',
diff --git a/chrome/chrome_web_ui_mojo_bindings.gyp b/chrome/chrome_web_ui_mojo_bindings.gyp
index d15f84e..1407b0d 100644
--- a/chrome/chrome_web_ui_mojo_bindings.gyp
+++ b/chrome/chrome_web_ui_mojo_bindings.gyp
@@ -13,7 +13,7 @@
       'sources': [
         'browser/ui/webui/omnibox/omnibox.mojom',
       ],
-      'includes': [ '../mojo/mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
     },
   ],
 }
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 9b1ee0a..965266f 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -209,8 +209,8 @@ source_set("test_support_unit") {
     "//chrome:strings",
     "//chrome/browser",
     "//chrome/common",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//third_party/mojo/src/mojo/edk/system",
   ]
 }
 
diff --git a/components/nacl.gyp b/components/nacl.gyp
index 3b66674..c734772 100644
--- a/components/nacl.gyp
+++ b/components/nacl.gyp
@@ -78,11 +78,11 @@
             '../base/base.gyp:base',
             '../base/base.gyp:base_static',
             '../ipc/ipc.gyp:ipc',
-            '../mojo/mojo_edk.gyp:mojo_system_impl',
             '../mojo/mojo_nacl.gyp:monacl_syscall',
             '../ppapi/ppapi_internal.gyp:ppapi_shared',
             '../ppapi/ppapi_internal.gyp:ppapi_ipc',
             '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel_main_chrome',
+            '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
           ],
           'conditions': [
             ['disable_nacl_untrusted==0', {
@@ -352,11 +352,11 @@
               },
               'dependencies': [
                 'nacl_common_win64',
-                '../mojo/mojo_edk.gyp:mojo_system_impl_win64',
                 '../mojo/mojo_nacl.gyp:monacl_syscall_win64',
                 '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel_main_chrome64',
                 '../ppapi/ppapi_internal.gyp:ppapi_shared_win64',
                 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
+                '../third_party/mojo/mojo_edk.gyp:mojo_system_impl_win64',
               ],
               'export_dependent_settings': [
                 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
index a47b6e9..97c738e 100644
--- a/content/app/BUILD.gn
+++ b/content/app/BUILD.gn
@@ -57,9 +57,9 @@ if (is_ios) {
   ]
 } else {
   content_app_deps += [
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
-    "//mojo/public/interfaces/application",
+    "//third_party/mojo/src/mojo/edk/system",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
   ]
 }
 
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 0712711..ffb7429 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -101,9 +101,6 @@ source_set("browser") {
       "//content/browser/devtools:resources",
       "//content/common:mojo_bindings",
       "//content/public/common:mojo_bindings",
-      "//mojo/public/cpp/bindings",
-      "//mojo/public/interfaces/application",
-      "//mojo/public/js",
       "//net:http_server",
       "//storage/browser",
       "//storage/common",
@@ -112,6 +109,9 @@ source_set("browser") {
       "//third_party/icu",
       "//third_party/leveldatabase",
       "//third_party/libyuv",
+      "//third_party/mojo/src/mojo/public/cpp/bindings",
+      "//third_party/mojo/src/mojo/public/interfaces/application",
+      "//third_party/mojo/src/mojo/public/js",
       "//ui/resources",
       "//ui/surface",
       "//ui/touch_selection",
diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
index fd57a63..c8478a9 100644
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -17,7 +17,7 @@ source_set("child") {
                         "//content")
 
   public_deps = [
-    "//mojo/edk/system",
+    "//third_party/mojo/src/mojo/edk/system",
   ]
 
   deps = [
@@ -25,9 +25,9 @@ source_set("child") {
     "//components/tracing",
     "//mojo/common",
     "//mojo/environment:chromium",
-    "//mojo/public/interfaces/application",
     "//skia",
     "//third_party/icu",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
     "//ui/base",
     "//ui/gfx",
     "//ui/gfx/geometry",
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 519c280..c80a5d5 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -5,7 +5,7 @@
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//content/common/common.gni")
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 if (is_chromeos && cpu_arch != "arm") {
   action("libva_generate_stubs") {
@@ -138,12 +138,12 @@ source_set("common") {
       "//gpu/skia_bindings",
       "//media",
       "//media:shared_memory_support",
-      "//mojo/edk/system",
       "//mojo/environment:chromium",
-      "//mojo/public/interfaces/application",
       "//sandbox",
       "//storage/common",
       "//third_party/WebKit/public:blink",
+      "//third_party/mojo/src/mojo/edk/system",
+      "//third_party/mojo/src/mojo/public/interfaces/application",
       "//ui/gl",
       "//webkit/common/gpu",
     ]
@@ -413,6 +413,6 @@ mojom("mojo_bindings") {
 
   deps = [
     "//content/public/common:mojo_bindings",
-    "//mojo/public/interfaces/application:application",
+    "//third_party/mojo/src/mojo/public/interfaces/application:application",
   ]
 }
diff --git a/content/content.gyp b/content/content.gyp
index 55a76b1..3adec3e 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -431,9 +431,9 @@
             '../device/vibration/vibration.gyp:device_vibration_java',
             '../media/media.gyp:media_java',
             '../mojo/mojo_base.gyp:mojo_system_java',
-            '../mojo/mojo_public.gyp:mojo_application_bindings',
-            '../mojo/mojo_public.gyp:mojo_bindings_java',
             '../net/net.gyp:net',
+            '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+            '../third_party/mojo/mojo_public.gyp:mojo_bindings_java',
             '../ui/android/ui_android.gyp:ui_java',
             '../ui/touch_selection/ui_touch_selection.gyp:selection_event_type_java',
             '../third_party/WebKit/public/blink_headers.gyp:blink_headers_java',
diff --git a/content/content_app.gypi b/content/content_app.gypi
index bfb5d46..1956312 100644
--- a/content/content_app.gypi
+++ b/content/content_app.gypi
@@ -11,7 +11,7 @@
     '../base/base.gyp:base_i18n',
     '../crypto/crypto.gyp:crypto',
     '../mojo/mojo_base.gyp:mojo_environment_chromium',
-    '../mojo/mojo_edk.gyp:mojo_system_impl',
+    '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
     '../ui/base/ui_base.gyp:ui_base',
     '../ui/gfx/gfx.gyp:gfx',
     '../ui/gfx/gfx.gyp:gfx_geometry',
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index f5fa1f8..c881609 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1676,18 +1676,18 @@
         'browser/devtools/devtools.gyp:devtools_protocol_handler',
         '../cc/cc.gyp:cc',
         '../cc/cc.gyp:cc_surfaces',
-        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
-        '../mojo/mojo_public.gyp:mojo_js_bindings',
         '../net/net.gyp:http_server',
         '../storage/storage_browser.gyp:storage',
         '../storage/storage_common.gyp:storage_common',
         '../third_party/angle/src/angle.gyp:commit_id',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_js_bindings',
         '../ui/surface/surface.gyp:surface',
         '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection',
       ],
       'export_dependent_settings': [
-        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     }],
     ['enable_basic_printing==1 or enable_print_preview==1', {
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 42a2e65..1948e36 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -576,17 +576,17 @@
         '../media/media.gyp:media',
         '../media/media.gyp:shared_memory_support',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../mojo/mojo_public.gyp:mojo_application_bindings',
-        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../storage/storage_common.gyp:storage_common',
         '../third_party/WebKit/public/blink.gyp:blink',
+        '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../ui/gl/gl.gyp:gl',
         '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
       ],
       'export_dependent_settings' : [
-        '../mojo/mojo_public.gyp:mojo_application_bindings',
-        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'actions': [
         {
diff --git a/content/content_common_mojo_bindings.gyp b/content/content_common_mojo_bindings.gyp
index e9bb7b2..f166301 100644
--- a/content/content_common_mojo_bindings.gyp
+++ b/content/content_common_mojo_bindings.gyp
@@ -21,7 +21,7 @@
           'public/common/permission_status.mojom',
         ],
       },
-      'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator_explicit.gypi' ],
     },
     {
       'target_name': 'content_common_mojo_bindings',
@@ -30,8 +30,8 @@
       'dependencies': [
         'content_common_mojo_bindings_mojom',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_public.gyp:mojo_application_bindings',
-        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ]
     },
   ]
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index e27f17e..907cc10 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -18,7 +18,6 @@
     '../media/blink/media_blink.gyp:media_blink',
     '../media/media.gyp:media',
     '../mojo/mojo_base.gyp:mojo_environment_chromium',
-    '../mojo/mojo_edk.gyp:mojo_js_lib',
     '../net/net.gyp:net',
     '../skia/skia.gyp:skia',
     '../storage/storage_common.gyp:storage_common',
@@ -26,6 +25,7 @@
     '../third_party/icu/icu.gyp:icui18n',
     '../third_party/icu/icu.gyp:icuuc',
     '../third_party/libjingle/libjingle.gyp:libjingle',
+    '../third_party/mojo/mojo_edk.gyp:mojo_js_lib',
     '../third_party/npapi/npapi.gyp:npapi',
     '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
     '../ui/accessibility/accessibility.gyp:accessibility',
diff --git a/content/content_resources.grd b/content/content_resources.grd
index beddb0f..5a53129 100644
--- a/content/content_resources.grd
+++ b/content/content_resources.grd
@@ -38,14 +38,14 @@
         <include name="IDR_UTILITY_SANDBOX_PROFILE" file="utility/utility.sb" type="BINDATA" />
       </if>
       <if expr="not is_ios">
-        <include name="IDR_MOJO_BINDINGS_JS" file="../mojo/public/js/bindings.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_MOJO_BUFFER_JS" file="../mojo/public/js/buffer.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_MOJO_CODEC_JS" file="../mojo/public/js/codec.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_MOJO_CONNECTION_JS" file="../mojo/public/js/connection.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_MOJO_CONNECTOR_JS" file="../mojo/public/js/connector.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_MOJO_ROUTER_JS" file="../mojo/public/js/router.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_MOJO_UNICODE_JS" file="../mojo/public/js/unicode.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_MOJO_VALIDATOR_JS" file="../mojo/public/js/validator.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MOJO_BINDINGS_JS" file="../third_party/mojo/src/mojo/public/js/bindings.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MOJO_BUFFER_JS" file="../third_party/mojo/src/mojo/public/js/buffer.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MOJO_CODEC_JS" file="../third_party/mojo/src/mojo/public/js/codec.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MOJO_CONNECTION_JS" file="../third_party/mojo/src/mojo/public/js/connection.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MOJO_CONNECTOR_JS" file="../third_party/mojo/src/mojo/public/js/connector.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MOJO_ROUTER_JS" file="../third_party/mojo/src/mojo/public/js/router.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MOJO_UNICODE_JS" file="../third_party/mojo/src/mojo/public/js/unicode.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_MOJO_VALIDATOR_JS" file="../third_party/mojo/src/mojo/public/js/validator.js" flattenhtml="true" type="BINDATA" />
       </if>
     </includes>
   </release>
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 00630f8..3b0ee34 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',
diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
index 5c82651..2a86d5c 100644
--- a/content/gpu/BUILD.gn
+++ b/content/gpu/BUILD.gn
@@ -26,8 +26,8 @@ source_set("gpu") {
     "//base",
     "//content:export",
     "//content/public/child:child_sources",
-    "//mojo/public/interfaces/application",
     "//skia",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
     "//ui/gl",
   ]
 
diff --git a/content/plugin/BUILD.gn b/content/plugin/BUILD.gn
index 03171de..fec2ab7 100644
--- a/content/plugin/BUILD.gn
+++ b/content/plugin/BUILD.gn
@@ -32,8 +32,8 @@ if (enable_plugins && !is_linux) {
 
     deps = [
       "//content:export",
-      "//mojo/public/interfaces/application",
       "//skia",
+      "//third_party/mojo/src/mojo/public/interfaces/application",
       "//third_party/npapi",
       "//third_party/WebKit/public:blink",
     ]
diff --git a/content/ppapi_plugin/BUILD.gn b/content/ppapi_plugin/BUILD.gn
index eff00a52..d6926ce 100644
--- a/content/ppapi_plugin/BUILD.gn
+++ b/content/ppapi_plugin/BUILD.gn
@@ -25,11 +25,11 @@ source_set("ppapi_plugin") {
     "//content:export",
     "//content/public/child:child_sources",
     "//content/public/common:common_sources",
-    "//mojo/public/interfaces/application",
     "//ppapi:ppapi_ipc",
     "//skia",
     "//third_party/icu",
     "//third_party/WebKit/public:blink",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
     "//ui/base",
     "//ui/gfx",
     "//ui/gfx/geometry",
diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
index f183202..28b9a8d 100644
--- a/content/public/android/BUILD.gn
+++ b/content/public/android/BUILD.gn
@@ -36,9 +36,9 @@ android_library("content_java") {
     "//device/battery:mojo_bindings_java",
     "//media/base/android:media_java",
     "//mojo/android:system_java",
-    "//mojo/public/java:bindings",
-    "//mojo/public/java:system",
     "//net/android:net_java",
+    "//third_party/mojo/src/mojo/public/java:bindings",
+    "//third_party/mojo/src/mojo/public/java:system",
     "//ui/android:ui_java",
     "//third_party/jsr-305:jsr_305_javalib",
     "//third_party/WebKit/public:blink_headers_java",
@@ -162,11 +162,11 @@ android_library("content_javatests") {
     "//content/shell/android:content_shell_test_java",
     "//media/base/android:media_java",
     "//mojo/android:system_java",
-    "//mojo/public/interfaces/bindings/tests:test_interfaces_java",
-    "//mojo/public/java:bindings",
-    "//mojo/public/java:system",
     "//net/android:net_java",
     "//net/android:net_java_test_support",
+    "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interfaces_java",
+    "//third_party/mojo/src/mojo/public/java:bindings",
+    "//third_party/mojo/src/mojo/public/java:system",
     "//ui/android:ui_java",
     ":content_java",
   ]
diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn
index 3b958e2..faedd44 100644
--- a/content/public/browser/BUILD.gn
+++ b/content/public/browser/BUILD.gn
@@ -49,7 +49,7 @@ source_set("browser_sources") {
     "//content/public/common:mojo_bindings",
     # We expose skia headers in the public API.
     "//skia",
-    "//mojo/public/cpp/system",
+    "//third_party/mojo/src/mojo/public/cpp/system",
   ]
   deps = [
     "//content/browser",
diff --git a/content/public/common/BUILD.gn b/content/public/common/BUILD.gn
index 36eef89..f65c357 100644
--- a/content/public/common/BUILD.gn
+++ b/content/public/common/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//build/config/features.gni")
 import("//content/common/common.gni")
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 # See //content/BUILD.gn for how this works.
 group("common") {
@@ -30,7 +30,7 @@ source_set("common_sources") {
 
   public_deps = [
     "//content/common",
-    "//mojo/public/cpp/bindings",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
   ]
   deps = [
     "//net",
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index 664d9d4..dd6b153 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -38,15 +38,15 @@ source_set("renderer") {
     "//jingle:jingle_glue",
     "//media",
     "//media/blink",
-    "//mojo/edk/js",
     "//mojo/environment:chromium",
-    "//mojo/public/js",
-    "//mojo/public/interfaces/application",
     "//net",
     "//skia",
     "//storage/common",
     "//third_party/icu",
     "//third_party/libjingle",
+    "//third_party/mojo/src/mojo/edk/js",
+    "//third_party/mojo/src/mojo/public/js",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
     "//third_party/npapi",
     "//third_party/WebKit/public:blink",
     "//third_party/widevine/cdm:version_h",
diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn
index 8a97595..ea6dc3f 100644
--- a/content/shell/android/BUILD.gn
+++ b/content/shell/android/BUILD.gn
@@ -49,8 +49,8 @@ android_library("content_shell_java") {
     "//base:base_java",
     "//content/public/android:content_java",
     "//media/base/android:media_java",
-    "//mojo/public/java:system",
     "//net/android:net_java",
+    "//third_party/mojo/src/mojo/public/java:system",
     "//ui/android:ui_java",
     ":content_shell_java_resources",
   ]
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 2ce975b..9d92c88 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -6,7 +6,7 @@ import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 content_tests_gypi_values =
     exec_script("//build/gypi_to_gn.py",
@@ -268,17 +268,17 @@ if (!is_mac) {
       "//media/audio:test_support",
       "//media/base:test_support",
       "//media:shared_memory_support",
-      "//mojo/edk/system",
-      "//mojo/edk/test:test_support",
       "//mojo/environment:chromium",
-      "//mojo/public/cpp/bindings",
-      "//mojo/public/js",
       "//net:test_support",
       "//ppapi:ppapi_host",
       "//ppapi:ppapi_ipc",
       "//ppapi:ppapi_proxy",
       "//ppapi:ppapi_shared",
 
+      "//third_party/mojo/src/mojo/edk/system",
+      "//third_party/mojo/src/mojo/edk/test:test_support",
+      "//third_party/mojo/src/mojo/public/cpp/bindings",
+      "//third_party/mojo/src/mojo/public/js",
       #"//ppapi:ppapi_tests",  TODO(GYP)
       #"//ppapi:ppapi_unittest_shared",  TODO(GYP)
       "//testing/gmock",
@@ -434,15 +434,15 @@ if (!is_mac) {  # TODO(GYP) enable on Mac once it links.
       "//crypto",
       "//device/battery",
       "//device/battery:mojo_bindings",
-      "//mojo/edk/test:test_support",
       "//mojo/environment:chromium",
-      "//mojo/public/cpp/bindings",
       "//net:test_support",
       "//skia",
       "//sql",
       "//sql:test_support",
       "//testing/gmock",
       "//testing/gtest",
+      "//third_party/mojo/src/mojo/edk/test:test_support",
+      "//third_party/mojo/src/mojo/public/cpp/bindings",
       "//third_party/re2",
       "//ui/accessibility",
       "//ui/base",
diff --git a/content/utility/BUILD.gn b/content/utility/BUILD.gn
index 96583ca..b045978 100644
--- a/content/utility/BUILD.gn
+++ b/content/utility/BUILD.gn
@@ -23,7 +23,7 @@ source_set("utility") {
     "//content/public/child:child_sources",
     "//content/public/common:common_sources",
     "//courgette:courgette_lib",
-    "//mojo/public/interfaces/application",
     "//third_party/WebKit/public:blink_headers",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
   ]
 }
diff --git a/device/battery/BUILD.gn b/device/battery/BUILD.gn
index e3afef7..6eaaae7 100644
--- a/device/battery/BUILD.gn
+++ b/device/battery/BUILD.gn
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 component("battery") {
   output_name = "device_battery"
@@ -30,8 +30,8 @@ component("battery") {
     "//base",
     "//base/third_party/dynamic_annotations",
     "//mojo/environment:chromium",
-    "//mojo/public/cpp/bindings",
-    "//mojo/edk/system",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//third_party/mojo/src/mojo/edk/system",
   ]
 
   if (is_chromeos) {
diff --git a/device/battery/android/BUILD.gn b/device/battery/android/BUILD.gn
index ea4d5cc..b156122 100644
--- a/device/battery/android/BUILD.gn
+++ b/device/battery/android/BUILD.gn
@@ -15,7 +15,7 @@ android_library("battery_monitor_android") {
   deps = [
     "//base:base_java",
     "//device/battery:mojo_bindings_java",
-    "//mojo/public/java:bindings",
-    "//mojo/public/java:system",
+    "//third_party/mojo/src/mojo/public/java:bindings",
+    "//third_party/mojo/src/mojo/public/java:system",
   ]
 }
diff --git a/device/battery/battery.gyp b/device/battery/battery.gyp
index 3b01922..fd0ed6f 100644
--- a/device/battery/battery.gyp
+++ b/device/battery/battery.gyp
@@ -12,7 +12,7 @@
       'target_name': 'device_battery_mojo_bindings',
       'type': 'static_library',
       'includes': [
-        '../../mojo/mojom_bindings_generator.gypi',
+        '../../third_party/mojo/mojom_bindings_generator.gypi',
       ],
       'sources': [
         'battery_monitor.mojom',
@@ -56,8 +56,8 @@
         '../../base/base.gyp:base',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'device_battery_mojo_bindings',
       ],
       'defines': [
@@ -122,7 +122,7 @@
           'type': 'none',
           'dependencies': [
             '../../base/base.gyp:base',
-            '../../mojo/mojo_public.gyp:mojo_bindings_java',
+            '../../third_party/mojo/mojo_public.gyp:mojo_bindings_java',
             'device_battery_mojo_bindings',
           ],
           'variables': {
diff --git a/device/device_tests.gyp b/device/device_tests.gyp
index 4943f96..df4f264 100644
--- a/device/device_tests.gyp
+++ b/device/device_tests.gyp
@@ -13,10 +13,10 @@
       'dependencies': [
         '../base/base.gyp:test_support_base',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../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',
         '../tools/usb_gadget/usb_gadget.gyp:usb_gadget',
         'battery/battery.gyp:device_battery',
         'battery/battery.gyp:device_battery_mojo_bindings',
diff --git a/device/serial/BUILD.gn b/device/serial/BUILD.gn
index e90618a..1382604 100644
--- a/device/serial/BUILD.gn
+++ b/device/serial/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 # GYP version: device/serial/serial.gyp:device_serial
 static_library("serial") {
diff --git a/device/serial/serial.gyp b/device/serial/serial.gyp
index d03c491..650c8c6 100644
--- a/device/serial/serial.gyp
+++ b/device/serial/serial.gyp
@@ -15,7 +15,7 @@
       # generated cpp files must be listed explicitly in device_serial
       'type': 'none',
       'includes': [
-        '../../mojo/mojom_bindings_generator.gypi',
+        '../../third_party/mojo/mojom_bindings_generator.gypi',
       ],
       'sources': [
         'data_stream.mojom',
@@ -42,12 +42,12 @@
       ],
       'dependencies': [
         'device_serial_mojo',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../../net/net.gyp:net',
+        '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'device_serial_mojo',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'sources': [
         '<(SHARED_INTERMEDIATE_DIR)/device/serial/data_stream.mojom.cc',
diff --git a/device/vibration/BUILD.gn b/device/vibration/BUILD.gn
index 867e87f..d2de6ab 100644
--- a/device/vibration/BUILD.gn
+++ b/device/vibration/BUILD.gn
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 component("vibration") {
   output_name = "device_vibration"
@@ -23,8 +23,8 @@ component("vibration") {
     "//base",
     "//base/third_party/dynamic_annotations",
     "//mojo/environment:chromium",
-    "//mojo/public/cpp/bindings",
-    "//mojo/edk/system",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//third_party/mojo/src/mojo/edk/system",
   ]
 
   if (is_android) {
diff --git a/device/vibration/vibration.gyp b/device/vibration/vibration.gyp
index 93133be..707c165 100644
--- a/device/vibration/vibration.gyp
+++ b/device/vibration/vibration.gyp
@@ -12,7 +12,7 @@
       'target_name': 'device_vibration_mojo_bindings',
       'type': 'static_library',
       'includes': [
-        '../../mojo/mojom_bindings_generator.gypi',
+        '../../third_party/mojo/mojom_bindings_generator.gypi',
       ],
       'sources': [
         'vibration_manager.mojom',
@@ -26,8 +26,8 @@
         '../../base/base.gyp:base',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'device_vibration_mojo_bindings',
       ],
       'defines': [
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
index c900458..9444d0f 100644
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -272,13 +272,13 @@ if (false) {
       "//extensions/common",
       "//extensions/renderer",
       "//extensions/strings",
-      "//mojo/edk/js",
-      "//mojo/edk/system",
       "//mojo/environment:chromium",
-      "//mojo/public/cpp/bindings",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/leveldatabase",
+      "//third_party/mojo/src/mojo/edk/js",
+      "//third_party/mojo/src/mojo/edk/system",
+      "//third_party/mojo/src/mojo/public/cpp/bindings",
     ]
 
     if (is_win) {
diff --git a/extensions/common/BUILD.gn b/extensions/common/BUILD.gn
index 6fa6f8b..f6dcd00 100644
--- a/extensions/common/BUILD.gn
+++ b/extensions/common/BUILD.gn
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 # GYP version: extensions/extensions.gyp:extensions_common_constants
 source_set("common_constants") {
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index a1f2f8b..e7e9b37 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -15,7 +15,7 @@
       # generated cpp files must be listed explicitly in extensions_common
       'type': 'none',
       'includes': [
-        '../mojo/mojom_bindings_generator.gypi',
+        '../third_party/mojo/mojom_bindings_generator.gypi',
       ],
       'sources': [
         'common/mojo/keep_alive.mojom',
@@ -867,8 +867,8 @@
         'extensions_resources.gyp:extensions_resources',
         '../content/content.gyp:content_resources',
         '../gin/gin.gyp:gin',
-        '../mojo/mojo_public.gyp:mojo_js_bindings',
         '../third_party/WebKit/public/blink.gyp:blink',
+        '../third_party/mojo/mojo_public.gyp:mojo_js_bindings',
       ],
       'include_dirs': [
         '..',
@@ -1181,12 +1181,12 @@
         '../device/serial/serial.gyp:device_serial',
         '../device/serial/serial.gyp:device_serial_test_util',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_edk.gyp:mojo_js_lib',
-        '../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+        '../third_party/mojo/mojo_edk.gyp:mojo_js_lib',
+        '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'common/api/api.gyp:cast_channel_proto',
         'extensions_common',
         'extensions_renderer',
diff --git a/extensions/renderer/BUILD.gn b/extensions/renderer/BUILD.gn
index fa14aea..63a388e 100644
--- a/extensions/renderer/BUILD.gn
+++ b/extensions/renderer/BUILD.gn
@@ -168,9 +168,9 @@ source_set("renderer") {
     "//content:resources",
     "//extensions:extensions_resources",
     "//gin",
-    "//mojo/edk/js",
     "//skia",
     "//third_party/WebKit/public:blink",
+    "//third_party/mojo/src/mojo/edk/js",
   ]
 
   if (is_win) {
diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn
index e0b3261..0f7b1cb 100644
--- a/extensions/shell/BUILD.gn
+++ b/extensions/shell/BUILD.gn
@@ -46,10 +46,10 @@ source_set("app_shell_lib") {
     "//extensions/utility",
     "//extensions:extensions_resources",
     "//extensions:shell_and_test_pak",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//skia",
     "//third_party/WebKit/public:blink",
+    "//third_party/mojo/src/mojo/edk/system",
     "//ui/wm",
     "//v8",
   ]
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index 392f3df0..7c60171 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -41,9 +41,9 @@
         '<(DEPTH)/extensions/shell/browser/api/api_registration.gyp:shell_api_registration',
         '<(DEPTH)/extensions/shell/common/api/api.gyp:shell_api',
         '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium',
-        '<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
+        '<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
       ],
       'export_dependent_settings': [
diff --git a/ipc/mojo/BUILD.gn b/ipc/mojo/BUILD.gn
index 0a061e6..7c04d18 100644
--- a/ipc/mojo/BUILD.gn
+++ b/ipc/mojo/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 mojom("client_channel") {
   sources = [
@@ -32,8 +32,8 @@ component("mojo") {
     "//base/third_party/dynamic_annotations",
     "//ipc",
     "//mojo/environment:chromium",
-    "//mojo/public/cpp/bindings",
-    "//mojo/edk/system",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//third_party/mojo/src/mojo/edk/system",
     ":client_channel",
   ]
 }
@@ -53,8 +53,8 @@ test("ipc_mojo_unittests") {
     "//ipc",
     "//ipc:test_support",
     "//ipc/mojo",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//third_party/mojo/src/mojo/edk/system",
     "//url",
   ]
 }
@@ -72,8 +72,8 @@ test("ipc_mojo_perftests") {
     "//ipc",
     "//ipc:test_support",
     "//ipc/mojo",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
+    "//third_party/mojo/src/mojo/edk/system",
     "//url",
   ]
 }
diff --git a/ipc/mojo/ipc_mojo.gyp b/ipc/mojo/ipc_mojo.gyp
index a0858e9..505f536 100644
--- a/ipc/mojo/ipc_mojo.gyp
+++ b/ipc/mojo/ipc_mojo.gyp
@@ -17,14 +17,14 @@
       'defines': [
         'IPC_MOJO_IMPLEMENTATION',
       ],
-      'includes': [ '../../mojo/mojom_bindings_generator.gypi' ],
+      'includes': [ '../../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
         '../ipc.gyp:ipc',
         '../../base/base.gyp:base',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'sources': [
         'client_channel.mojom',
@@ -57,9 +57,9 @@
         '../../base/base.gyp:base_i18n',
         '../../base/base.gyp:test_support_base',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../../testing/gtest.gyp:gtest',
+        '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'ipc_mojo',
       ],
       'include_dirs': [
@@ -85,9 +85,9 @@
         '../../base/base.gyp:test_support_base',
         '../../base/base.gyp:test_support_perf',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
         '../../testing/gtest.gyp:gtest',
+        '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'ipc_mojo',
       ],
       'include_dirs': [
diff --git a/media/mojo/interfaces/BUILD.gn b/media/mojo/interfaces/BUILD.gn
index d27ea306..b483688 100644
--- a/media/mojo/interfaces/BUILD.gn
+++ b/media/mojo/interfaces/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 mojom("interfaces") {
   sources = [
diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
index 6096a07..63e37f2 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/mojo_application.gni")
+import("//third_party/mojo/src/mojo/public/mojo_application.gni")
 
 # Target naming conventions:
 # - converters: C++/Mojo type converters.
@@ -24,9 +24,9 @@ source_set("converters") {
     "//mojo/common",
     "//mojo/converters/geometry",
     "//mojo/environment:chromium",
-    "//mojo/public/c/system:for_component",
     "//mojo/services/geometry/public/interfaces",
     "//skia",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
   ]
 }
 
@@ -36,11 +36,11 @@ source_set("cdm_proxy") {
     "//base",
     "//media",
     "//media/mojo/interfaces",
-    "//mojo/public/interfaces/application",
     "//mojo/common",
     "//mojo/environment:chromium",
-    "//mojo/public/c/system:for_component",
-    "//mojo/public/cpp/application",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
+    "//third_party/mojo/src/mojo/public/cpp/application",
   ]
 
   sources = [
@@ -56,10 +56,10 @@ source_set("cdm_service") {
     "//base",
     "//media",
     "//media/mojo/interfaces",
-    "//mojo/public/interfaces/application",
     "//mojo/common",
     "//mojo/environment:chromium",
-    "//mojo/public/c/system:for_component",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
   ]
 
   sources = [
@@ -89,9 +89,9 @@ source_set("renderer_proxy") {
     "//media/mojo/interfaces",
     "//mojo/common",
     "//mojo/environment:chromium",
-    "//mojo/public/c/system:for_component",
-    "//mojo/public/cpp/application",
-    "//mojo/public/interfaces/application",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
+    "//third_party/mojo/src/mojo/public/cpp/application",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
   ]
 }
 
@@ -143,10 +143,10 @@ test("media_mojo_unittests") {
     "//base/test:test_support",
     "//media",
     "//media/mojo/interfaces",
-    "//mojo/edk/system",
-    "//mojo/edk/test:run_all_unittests",
     "//mojo/environment:chromium",
     "//testing/gtest",
+    "//third_party/mojo/src/mojo/edk/system",
+    "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
   ]
 }
 
@@ -159,7 +159,7 @@ if (!is_component_build) {
     deps = [
       ":renderer_service",
       "//mojo/application",
-      "//mojo/public/c/system:for_shared_library",
+      "//third_party/mojo/src/mojo/public/c/system:for_shared_library",
     ]
   }
 
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index 8c777d0..f4432cd 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -10,8 +10,8 @@ group("mojo") {
   deps = [
     ":tests",
     "//mojo/common",
-    "//mojo/public",
     "//mojo/services",
+    "//third_party/mojo/src/mojo/public",
   ]
 
   if (is_android) {
@@ -24,14 +24,14 @@ group("tests") {
   deps = [
     "//mojo/common:mojo_common_unittests",
     "//mojo/converters/surfaces/tests:mojo_surfaces_lib_unittests",
-    "//mojo/edk/js/test:js_unittests",
-    "//mojo/edk/system:mojo_message_pipe_perftests",
-    "//mojo/edk/system:mojo_system_unittests",
-    "//mojo/edk/test:mojo_public_application_unittests",
-    "//mojo/edk/test:mojo_public_bindings_unittests",
-    "//mojo/edk/test:mojo_public_environment_unittests",
-    "//mojo/edk/test:mojo_public_system_perftests",
-    "//mojo/edk/test:mojo_public_system_unittests",
-    "//mojo/edk/test:mojo_public_utility_unittests",
+    "//third_party/mojo/src/mojo/edk/js/test:js_unittests",
+    "//third_party/mojo/src/mojo/edk/system:mojo_message_pipe_perftests",
+    "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests",
+    "//third_party/mojo/src/mojo/edk/test:mojo_public_application_unittests",
+    "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests",
+    "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests",
+    "//third_party/mojo/src/mojo/edk/test:mojo_public_system_perftests",
+    "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests",
+    "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
   ]
 }
diff --git a/mojo/android/BUILD.gn b/mojo/android/BUILD.gn
index a816a04..25f3bfa 100644
--- a/mojo/android/BUILD.gn
+++ b/mojo/android/BUILD.gn
@@ -42,9 +42,9 @@ source_set("libsystem_java") {
   deps = [
     ":system_java_jni_headers",
     "//base",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
-    "//mojo/public/cpp/environment",
+    "//third_party/mojo/src/mojo/edk/system",
+    "//third_party/mojo/src/mojo/public/cpp/environment",
   ]
 }
 
@@ -61,7 +61,7 @@ android_library("system_java") {
 
   deps = [
     "//base:base_java",
-    "//mojo/public/java:system",
+    "//third_party/mojo/src/mojo/public/java:system",
   ]
 }
 
@@ -93,9 +93,9 @@ android_library("mojo_javatests") {
     ":system_java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//mojo/public/interfaces/bindings/tests:test_interfaces_java",
-    "//mojo/public/java:bindings",
-    "//mojo/public/java:system",
+    "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interfaces_java",
+    "//third_party/mojo/src/mojo/public/java:bindings",
+    "//third_party/mojo/src/mojo/public/java:system",
   ]
 }
 
@@ -117,10 +117,10 @@ shared_library("mojo_java_unittests") {
     "//base",
     "//base/test/:test_support",
     "//mojo/common",
-    "//mojo/edk/system",
-    "//mojo/public/cpp/bindings/tests:mojo_public_bindings_test_utils",
-    "//mojo/public/cpp/test_support:test_utils",
-    "//mojo/public/cpp/environment",
+    "//third_party/mojo/src/mojo/edk/system",
+    "//third_party/mojo/src/mojo/public/cpp/bindings/tests:mojo_public_bindings_test_utils",
+    "//third_party/mojo/src/mojo/public/cpp/test_support:test_utils",
+    "//third_party/mojo/src/mojo/public/cpp/environment",
   ]
   defines = [ "UNIT_TEST" ]
 }
@@ -132,8 +132,8 @@ android_apk("mojo_test_apk") {
     ":mojo_java_unittests",
     ":system_java",
     "//base:base_java",
-    "//mojo/public/java:bindings",
-    "//mojo/public/interfaces/bindings/tests:test_interfaces",
+    "//third_party/mojo/src/mojo/public/java:bindings",
+    "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interfaces",
   ]
   native_libs = [ "libmojo_java_unittests.so" ]
   apk_name = "MojoTest"
diff --git a/mojo/application/BUILD.gn b/mojo/application/BUILD.gn
index fc8d376..dda877e 100644
--- a/mojo/application/BUILD.gn
+++ b/mojo/application/BUILD.gn
@@ -10,7 +10,7 @@ source_set("application") {
   ]
 
   public_deps = [
-    "//mojo/public/cpp/application",
+    "//third_party/mojo/src/mojo/public/cpp/application",
   ]
   deps = [
     "//base",
@@ -26,7 +26,7 @@ source_set("test_support") {
   ]
 
   public_deps = [
-    "//mojo/public/cpp/application:test_support",
+    "//third_party/mojo/src/mojo/public/cpp/application:test_support",
   ]
   deps = [
     "//base",
diff --git a/mojo/cc/BUILD.gn b/mojo/cc/BUILD.gn
index e208044..43b9041 100644
--- a/mojo/cc/BUILD.gn
+++ b/mojo/cc/BUILD.gn
@@ -12,11 +12,11 @@ source_set("cc") {
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/command_buffer/client:gles2_interface",
     "//mojo/converters/surfaces",
-    "//mojo/public/c/gles2",
-    "//mojo/public/cpp/environment",
-    "//mojo/public/cpp/system",
     "//mojo/services/surfaces/public/interfaces",
     "//skia",
+    "//third_party/mojo/src/mojo/public/c/gles2",
+    "//third_party/mojo/src/mojo/public/cpp/environment",
+    "//third_party/mojo/src/mojo/public/cpp/system",
   ]
 
   sources = [
diff --git a/mojo/common/BUILD.gn b/mojo/common/BUILD.gn
index df1e4df..4248ff2 100644
--- a/mojo/common/BUILD.gn
+++ b/mojo/common/BUILD.gn
@@ -25,7 +25,7 @@ component("common") {
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
-    "//mojo/public/c/system:for_component",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
     "//url",
   ]
 }
@@ -36,12 +36,12 @@ test("mojo_common_unittests") {
     ":common",
     "//base",
     "//base:message_loop_tests",
-    "//mojo/edk/test:run_all_unittests",
-    "//mojo/edk/test:test_support",
     "//mojo/environment:chromium",
-    "//mojo/public/cpp/bindings",
-    "//mojo/public/cpp/test_support:test_utils",
     "//testing/gtest",
+    "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
+    "//third_party/mojo/src/mojo/edk/test:test_support",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//third_party/mojo/src/mojo/public/cpp/test_support:test_utils",
     "//url",
   ]
 
diff --git a/mojo/converters/geometry/BUILD.gn b/mojo/converters/geometry/BUILD.gn
index 9d80efe..b8c1d00 100644
--- a/mojo/converters/geometry/BUILD.gn
+++ b/mojo/converters/geometry/BUILD.gn
@@ -13,8 +13,8 @@ component("geometry") {
     "//skia",
     "//ui/gfx/geometry",
     "//mojo/environment:chromium",
-    "//mojo/public/c/system:for_component",
     "//mojo/services/geometry/public/interfaces",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
   ]
 
   defines = [ "MOJO_GEOMETRY_IMPLEMENTATION" ]
diff --git a/mojo/converters/input_events/BUILD.gn b/mojo/converters/input_events/BUILD.gn
index bc93b4d..751d039 100644
--- a/mojo/converters/input_events/BUILD.gn
+++ b/mojo/converters/input_events/BUILD.gn
@@ -19,8 +19,8 @@ component("input_events") {
     "//ui/gfx/geometry",
     "//mojo/converters/geometry",
     "//mojo/environment:chromium",
-    "//mojo/public/c/system:for_component",
     "//mojo/services/input_events/public/interfaces",
     "//mojo/services/geometry/public/interfaces",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
   ]
 }
diff --git a/mojo/converters/surfaces/BUILD.gn b/mojo/converters/surfaces/BUILD.gn
index df4404e..132a858 100644
--- a/mojo/converters/surfaces/BUILD.gn
+++ b/mojo/converters/surfaces/BUILD.gn
@@ -28,9 +28,9 @@ component("surfaces") {
     "//gpu",
     "//ui/gfx/geometry",
     "//mojo/environment:chromium",
-    "//mojo/public/c/system:for_component",
     "//mojo/services/surfaces/public/interfaces:surface_id",
     "//mojo/services/surfaces/public/interfaces",
     "//skia",
+    "//third_party/mojo/src/mojo/public/c/system:for_component",
   ]
 }
diff --git a/mojo/converters/surfaces/tests/BUILD.gn b/mojo/converters/surfaces/tests/BUILD.gn
index 982afde..6e60f08 100644
--- a/mojo/converters/surfaces/tests/BUILD.gn
+++ b/mojo/converters/surfaces/tests/BUILD.gn
@@ -12,12 +12,12 @@ test("mojo_surfaces_lib_unittests") {
     "//gpu",
     "//mojo/converters/geometry",
     "//mojo/converters/surfaces",
-    "//mojo/edk/test:run_all_unittests",
     "//mojo/environment:chromium",
     "//mojo/services/geometry/public/interfaces",
     "//mojo/services/surfaces/public/interfaces",
     "//skia",
     "//testing/gtest",
+    "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gfx:test_support",
diff --git a/mojo/environment/BUILD.gn b/mojo/environment/BUILD.gn
index e10850a..d08ca62 100644
--- a/mojo/environment/BUILD.gn
+++ b/mojo/environment/BUILD.gn
@@ -10,8 +10,8 @@ source_set("chromium") {
     "environment.cc",
 
     # TODO(vtl): This is kind of ugly. (See TODO in logging.h.)
-    "../public/cpp/environment/logging.h",
-    "../public/cpp/environment/lib/logging.cc",
+    "//third_party/mojo/src/mojo/public/cpp/environment/logging.h",
+    "//third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc",
   ]
 
   public_deps = [
@@ -35,6 +35,8 @@ component("chromium_impl") {
 
   defines = [ "MOJO_ENVIRONMENT_IMPL_IMPLEMENTATION" ]
 
+  public_configs = [ "//third_party/mojo/src/mojo/public/build/config:mojo_sdk" ]
+
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 5c7bd14..db66ef2 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -4,7 +4,7 @@
 
 {
   'includes': [
-    'mojo_variables.gypi',
+    '../third_party/mojo/mojo_variables.gypi',
   ],
   'targets': [
     {
@@ -13,10 +13,10 @@
       'type': 'none',
       'dependencies': [
         'mojo_base.gyp:mojo_base',
-        'mojo_edk_tests.gyp:mojo_edk_tests',
+        '../third_party/mojo/mojo_edk_tests.gyp:mojo_edk_tests',
         'mojo_geometry_converters.gyp:mojo_geometry_lib',
         'mojo_input_events_converters.gyp:mojo_input_events_lib',
-        'mojo_public.gyp:mojo_public',
+        '../third_party/mojo/mojo_public.gyp:mojo_public',
         'mojo_services_public.gyp:mojo_services_public',
       ],
     },
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp
index 32f6d0a..2000120 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': [
-    'mojo_variables.gypi',
+    '../third_party/mojo/mojo_variables.gypi',
   ],
   'targets': [
     {
@@ -25,8 +25,8 @@
       'conditions': [
         ['OS == "android"', {
           'dependencies': [
-            'mojo_public.gyp:mojo_bindings_java',
-            'mojo_public.gyp:mojo_public_java',
+            '../third_party/mojo/mojo_public.gyp:mojo_bindings_java',
+            '../third_party/mojo/mojo_public.gyp:mojo_public_java',
           ],
         }],
       ]
@@ -76,12 +76,12 @@
         '../testing/gtest.gyp:gtest',
         '../url/url.gyp:url_lib',
         'mojo_common_lib',
-        'mojo_edk.gyp:mojo_system_impl',
-        'mojo_edk.gyp:mojo_common_test_support',
-        'mojo_edk.gyp:mojo_run_all_unittests',
+        '../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',
         'mojo_environment_chromium',
-        'mojo_public.gyp:mojo_cpp_bindings',
-        'mojo_public.gyp:mojo_public_test_utils',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_public_test_utils',
       ],
       'sources': [
         'common/common_type_converters_unittest.cc',
@@ -99,12 +99,18 @@
       'sources': [
         'environment/environment.cc',
         # TODO(vtl): This is kind of ugly. (See TODO in logging.h.)
-        "public/cpp/environment/logging.h",
-        "public/cpp/environment/lib/logging.cc",
+        "../third_party/mojo/src/mojo/public/cpp/environment/logging.h",
+        "../third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc",
       ],
       'include_dirs': [
         '..',
+        '../third_party/mojo/src',
       ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../third_party/mojo/src',
+        ],
+      },
       'export_dependent_settings': [
         'mojo_environment_chromium_impl',
       ],
@@ -132,7 +138,13 @@
       ],
       'include_dirs': [
         '..',
+        '../third_party/mojo/src',
       ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../third_party/mojo/src',
+        ],
+      },
     },
     {
      # GN version: //mojo/application
@@ -145,10 +157,10 @@
       'dependencies': [
         'mojo_common_lib',
         'mojo_environment_chromium',
-        'mojo_public.gyp:mojo_application_base',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_base',
        ],
       'export_dependent_settings': [
-        'mojo_public.gyp:mojo_application_base',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_base',
        ],
     },
   ],
@@ -178,7 +190,7 @@
             '../base/base.gyp:base',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             'mojo_common_lib',
-            'mojo_edk.gyp:mojo_system_impl',
+            '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
             'mojo_environment_chromium',
             'mojo_jni_headers',
           ],
@@ -202,7 +214,7 @@
           'dependencies': [
             '../base/base.gyp:base_java',
             'libmojo_system_java',
-            'mojo_public.gyp:mojo_public_java',
+            '../third_party/mojo/mojo_public.gyp:mojo_public_java',
           ],
           'variables': {
             'java_in_dir': '<(DEPTH)/mojo/android/system',
diff --git a/mojo/mojo_edk_system_impl.gypi b/mojo/mojo_edk_system_impl.gypi
deleted file mode 100644
index 029edb9..0000000
--- a/mojo/mojo_edk_system_impl.gypi
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright (c) 2014 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.
-
-# The dictionary here is defined for use by the "mojo_system_impl" and
-# "mojo_system_impl_win64" targets in mojo/mojo_edk.gyp. It's defined in this
-# .gypi file so the sections aren't duplicated.
-{
-  'defines': [
-    'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
-    'MOJO_SYSTEM_IMPLEMENTATION',
-    'MOJO_USE_SYSTEM_IMPL',
-  ],
-  'sources': [
-    'edk/embedder/configuration.h',
-    'edk/embedder/channel_info_forward.h',
-    'edk/embedder/channel_init.cc',
-    'edk/embedder/channel_init.h',
-    'edk/embedder/embedder.cc',
-    'edk/embedder/embedder.h',
-    'edk/embedder/embedder_internal.h',
-    'edk/embedder/entrypoints.cc',
-    'edk/embedder/platform_channel_pair.cc',
-    'edk/embedder/platform_channel_pair.h',
-    'edk/embedder/platform_channel_pair_posix.cc',
-    'edk/embedder/platform_channel_pair_win.cc',
-    'edk/embedder/platform_channel_utils_posix.cc',
-    'edk/embedder/platform_channel_utils_posix.h',
-    'edk/embedder/platform_handle.cc',
-    'edk/embedder/platform_handle.h',
-    'edk/embedder/platform_handle_utils.h',
-    'edk/embedder/platform_handle_utils_posix.cc',
-    'edk/embedder/platform_handle_utils_win.cc',
-    'edk/embedder/platform_handle_vector.h',
-    'edk/embedder/platform_shared_buffer.h',
-    'edk/embedder/platform_support.h',
-    'edk/embedder/scoped_platform_handle.h',
-    'edk/embedder/simple_platform_shared_buffer.cc',
-    'edk/embedder/simple_platform_shared_buffer.h',
-    'edk/embedder/simple_platform_shared_buffer_android.cc',
-    'edk/embedder/simple_platform_shared_buffer_posix.cc',
-    'edk/embedder/simple_platform_shared_buffer_win.cc',
-    'edk/embedder/simple_platform_support.cc',
-    'edk/embedder/simple_platform_support.h',
-    'edk/system/awakable.h',
-    'edk/system/awakable_list.cc',
-    'edk/system/awakable_list.h',
-    'edk/system/async_waiter.cc',
-    'edk/system/async_waiter.h',
-    'edk/system/channel.cc',
-    'edk/system/channel.h',
-    'edk/system/channel_endpoint.cc',
-    'edk/system/channel_endpoint.h',
-    'edk/system/channel_endpoint_client.h',
-    'edk/system/channel_endpoint_id.cc',
-    'edk/system/channel_endpoint_id.h',
-    'edk/system/channel_info.cc',
-    'edk/system/channel_info.h',
-    'edk/system/channel_manager.cc',
-    'edk/system/channel_manager.h',
-    'edk/system/configuration.cc',
-    'edk/system/configuration.h',
-    'edk/system/core.cc',
-    'edk/system/core.h',
-    'edk/system/data_pipe.cc',
-    'edk/system/data_pipe.h',
-    'edk/system/data_pipe_consumer_dispatcher.cc',
-    'edk/system/data_pipe_consumer_dispatcher.h',
-    'edk/system/data_pipe_producer_dispatcher.cc',
-    'edk/system/data_pipe_producer_dispatcher.h',
-    'edk/system/dispatcher.cc',
-    'edk/system/dispatcher.h',
-    'edk/system/endpoint_relayer.cc',
-    'edk/system/endpoint_relayer.h',
-    'edk/system/handle_signals_state.h',
-    'edk/system/handle_table.cc',
-    'edk/system/handle_table.h',
-    'edk/system/incoming_endpoint.cc',
-    'edk/system/incoming_endpoint.h',
-    'edk/system/local_data_pipe.cc',
-    'edk/system/local_data_pipe.h',
-    'edk/system/local_message_pipe_endpoint.cc',
-    'edk/system/local_message_pipe_endpoint.h',
-    'edk/system/mapping_table.cc',
-    'edk/system/mapping_table.h',
-    'edk/system/memory.cc',
-    'edk/system/memory.h',
-    'edk/system/message_in_transit.cc',
-    'edk/system/message_in_transit.h',
-    'edk/system/message_in_transit_queue.cc',
-    'edk/system/message_in_transit_queue.h',
-    'edk/system/message_pipe.cc',
-    'edk/system/message_pipe.h',
-    'edk/system/message_pipe_dispatcher.cc',
-    'edk/system/message_pipe_dispatcher.h',
-    'edk/system/message_pipe_endpoint.cc',
-    'edk/system/message_pipe_endpoint.h',
-    'edk/system/options_validation.h',
-    'edk/system/platform_handle_dispatcher.cc',
-    'edk/system/platform_handle_dispatcher.h',
-    'edk/system/proxy_message_pipe_endpoint.cc',
-    'edk/system/proxy_message_pipe_endpoint.h',
-    'edk/system/raw_channel.cc',
-    'edk/system/raw_channel.h',
-    'edk/system/raw_channel_posix.cc',
-    'edk/system/raw_channel_win.cc',
-    'edk/system/shared_buffer_dispatcher.cc',
-    'edk/system/shared_buffer_dispatcher.h',
-    'edk/system/simple_dispatcher.cc',
-    'edk/system/simple_dispatcher.h',
-    'edk/system/transport_data.cc',
-    'edk/system/transport_data.h',
-    'edk/system/waiter.cc',
-    'edk/system/waiter.h',
-    # Test-only code:
-    # TODO(vtl): It's a little unfortunate that these end up in the same
-    # component as non-test-only code. In the static build, this code
-    # should hopefully be dead-stripped.
-    'edk/embedder/test_embedder.cc',
-    'edk/embedder/test_embedder.h',
-  ],
-  'all_dependent_settings': {
-    # Ensures that dependent projects import the core functions on Windows.
-    'defines': ['MOJO_USE_SYSTEM_IMPL'],
-  },
-  'conditions': [
-    ['OS=="android"', {
-      'dependencies': [
-        '<(DEPTH)/third_party/ashmem/ashmem.gyp:ashmem',
-      ],
-    }],
-  ],
-}
diff --git a/mojo/mojo_geometry_converters.gyp b/mojo/mojo_geometry_converters.gyp
index e0bfb0b..28e74fa 100644
--- a/mojo/mojo_geometry_converters.gyp
+++ b/mojo/mojo_geometry_converters.gyp
@@ -4,7 +4,7 @@
 
 {
   'includes': [
-    'mojo_variables.gypi',
+    '../third_party/mojo/mojo_variables.gypi',
   ],
   'targets': [
     {
diff --git a/mojo/mojo_input_events_converters.gyp b/mojo/mojo_input_events_converters.gyp
index b212b5b..6f8e9d4 100644
--- a/mojo/mojo_input_events_converters.gyp
+++ b/mojo/mojo_input_events_converters.gyp
@@ -4,7 +4,7 @@
 
 {
   'includes': [
-    'mojo_variables.gypi',
+    '../third_party/mojo/mojo_variables.gypi',
   ],
   'targets': [
     {
diff --git a/mojo/mojo_nacl.gyp b/mojo/mojo_nacl.gyp
index d7ffe19..0215be4 100644
--- a/mojo/mojo_nacl.gyp
+++ b/mojo/mojo_nacl.gyp
@@ -50,7 +50,7 @@
             '<(monacl_codegen_dir)/mojo_syscall.cc',
           ],
           'dependencies': [
-            'mojo_public.gyp:mojo_system_placeholder',
+            '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder',
           ],
         },
         {
@@ -76,7 +76,7 @@
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
-            'mojo_edk.gyp:mojo_system_impl',
+            '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
             'monacl_sel',
           ],
           'sources': [
@@ -100,7 +100,7 @@
                 '<(monacl_codegen_dir)/mojo_syscall.cc',
               ],
               'dependencies': [
-                'mojo_public.gyp:mojo_system_placeholder',
+                '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder',
               ],
               'configurations': {
                 'Common_Base': {
diff --git a/mojo/mojo_nacl_untrusted.gyp b/mojo/mojo_nacl_untrusted.gyp
index 0cb4948..859c570 100644
--- a/mojo/mojo_nacl_untrusted.gyp
+++ b/mojo/mojo_nacl_untrusted.gyp
@@ -9,9 +9,9 @@
         'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))/monacl',
       },
       'includes': [
-        'mojo_variables.gypi',
         '../build/common_untrusted.gypi',
         '../components/nacl/nacl_defines.gypi',
+        '../third_party/mojo/mojo_variables.gypi',
       ],
       'targets': [
         {
@@ -31,7 +31,7 @@
           ],
           'dependencies': [
             'mojo_nacl.gyp:monacl_codegen',
-            'mojo_public.gyp:mojo_system_placeholder',
+            '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder',
           ],
         },
         {
diff --git a/mojo/mojo_public.gyp b/mojo/mojo_public.gyp
deleted file mode 100644
index ecd8bc1..0000000
--- a/mojo/mojo_public.gyp
+++ /dev/null
@@ -1,389 +0,0 @@
-# Copyright 2014 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.
-
-{
-  'includes': [
-    'mojo_variables.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'mojo_public',
-      'type': 'none',
-      'dependencies': [
-        'mojo_js_bindings',
-        'mojo_public_test_interfaces',
-        'mojo_public_test_utils',
-        'mojo_system',
-        'mojo_utility',
-      ],
-    },
-    {
-      # Targets that (a) need to obtain the settings that mojo_system passes on
-      # to its direct dependents but (b) are not themselves in a position to
-      # hardcode a dependency to mojo_system vs. mojo_system_impl (e.g.,
-      # because they are components) should depend on this target.
-      'target_name': 'mojo_system_placeholder',
-      'type': 'none',
-    },
-    {
-      # GN version: //mojo/public/c/system
-      'target_name': 'mojo_system',
-      'type': 'static_library',
-      'defines': [
-        'MOJO_SYSTEM_IMPLEMENTATION',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '..',
-        ],
-      },
-      'all_dependent_settings': {
-        'conditions': [
-          # We need to be able to call the MojoSetSystemThunks() function in
-          # system_thunks.cc
-          ['OS=="android"', {
-            'ldflags!': [
-              '-Wl,--exclude-libs=ALL',
-            ],
-          }],
-        ],
-      },
-      'sources': [
-        'public/c/system/buffer.h',
-        'public/c/system/core.h',
-        'public/c/system/data_pipe.h',
-        'public/c/system/functions.h',
-        'public/c/system/macros.h',
-        'public/c/system/message_pipe.h',
-        'public/c/system/system_export.h',
-        'public/c/system/types.h',
-        'public/platform/native/system_thunks.cc',
-        'public/platform/native/system_thunks.h',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/bindings
-      'target_name': 'mojo_cpp_bindings',
-      'type': 'static_library',
-      'include_dirs': [
-        '..'
-      ],
-      'sources': [
-        'public/cpp/bindings/array.h',
-        'public/cpp/bindings/binding.h',
-        'public/cpp/bindings/callback.h',
-        'public/cpp/bindings/error_handler.h',
-        'public/cpp/bindings/interface_impl.h',
-        'public/cpp/bindings/interface_ptr.h',
-        'public/cpp/bindings/interface_request.h',
-        'public/cpp/bindings/message.h',
-        'public/cpp/bindings/message_filter.h',
-        'public/cpp/bindings/no_interface.h',
-        'public/cpp/bindings/string.h',
-        'public/cpp/bindings/strong_binding.h',
-        'public/cpp/bindings/type_converter.h',
-        'public/cpp/bindings/lib/array_internal.h',
-        'public/cpp/bindings/lib/array_internal.cc',
-        'public/cpp/bindings/lib/array_serialization.h',
-        'public/cpp/bindings/lib/bindings_internal.h',
-        'public/cpp/bindings/lib/bindings_serialization.cc',
-        'public/cpp/bindings/lib/bindings_serialization.h',
-        'public/cpp/bindings/lib/bounds_checker.cc',
-        'public/cpp/bindings/lib/bounds_checker.h',
-        'public/cpp/bindings/lib/buffer.h',
-        'public/cpp/bindings/lib/callback_internal.h',
-        'public/cpp/bindings/lib/connector.cc',
-        'public/cpp/bindings/lib/connector.h',
-        'public/cpp/bindings/lib/filter_chain.cc',
-        'public/cpp/bindings/lib/filter_chain.h',
-        'public/cpp/bindings/lib/fixed_buffer.cc',
-        'public/cpp/bindings/lib/fixed_buffer.h',
-        'public/cpp/bindings/lib/interface_ptr_internal.h',
-        'public/cpp/bindings/lib/map_data_internal.h',
-        'public/cpp/bindings/lib/map_internal.h',
-        'public/cpp/bindings/lib/map_serialization.h',
-        'public/cpp/bindings/lib/message.cc',
-        'public/cpp/bindings/lib/message_builder.cc',
-        'public/cpp/bindings/lib/message_builder.h',
-        'public/cpp/bindings/lib/message_filter.cc',
-        'public/cpp/bindings/lib/message_header_validator.cc',
-        'public/cpp/bindings/lib/message_header_validator.h',
-        'public/cpp/bindings/lib/message_internal.h',
-        'public/cpp/bindings/lib/message_queue.cc',
-        'public/cpp/bindings/lib/message_queue.h',
-        'public/cpp/bindings/lib/no_interface.cc',
-        'public/cpp/bindings/lib/router.cc',
-        'public/cpp/bindings/lib/router.h',
-        'public/cpp/bindings/lib/shared_data.h',
-        'public/cpp/bindings/lib/shared_ptr.h',
-        'public/cpp/bindings/lib/string_serialization.h',
-        'public/cpp/bindings/lib/string_serialization.cc',
-        'public/cpp/bindings/lib/validate_params.h',
-        'public/cpp/bindings/lib/validation_errors.cc',
-        'public/cpp/bindings/lib/validation_errors.h',
-      ],
-    },
-    {
-      # GN version: //mojo/public/js
-      'target_name': 'mojo_js_bindings',
-      'type': 'static_library',
-      'include_dirs': [
-        '..'
-      ],
-      'sources': [
-        'public/js/constants.cc',
-        'public/js/constants.h',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/environment:standalone
-      'target_name': 'mojo_environment_standalone',
-      'type': 'static_library',
-      'sources': [
-        'public/c/environment/async_waiter.h',
-        'public/c/environment/logger.h',
-        'public/cpp/environment/async_waiter.h',
-        'public/cpp/environment/environment.h',
-        'public/cpp/environment/lib/async_waiter.cc',
-        'public/cpp/environment/lib/default_async_waiter.cc',
-        'public/cpp/environment/lib/default_async_waiter.h',
-        'public/cpp/environment/lib/default_logger.cc',
-        'public/cpp/environment/lib/default_logger.h',
-        'public/cpp/environment/lib/environment.cc',
-        'public/cpp/environment/lib/logging.cc',
-        'public/cpp/environment/logging.h',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/utility
-      'target_name': 'mojo_utility',
-      'type': 'static_library',
-      'sources': [
-        'public/cpp/utility/mutex.h',
-        'public/cpp/utility/run_loop.h',
-        'public/cpp/utility/run_loop_handler.h',
-        'public/cpp/utility/thread.h',
-        'public/cpp/utility/lib/mutex.cc',
-        'public/cpp/utility/lib/run_loop.cc',
-        'public/cpp/utility/lib/thread.cc',
-        'public/cpp/utility/lib/thread_local.h',
-        'public/cpp/utility/lib/thread_local_posix.cc',
-        'public/cpp/utility/lib/thread_local_win.cc',
-      ],
-      'conditions': [
-        # See crbug.com/342893:
-        ['OS=="win"', {
-          'sources!': [
-            'public/cpp/utility/mutex.h',
-            'public/cpp/utility/thread.h',
-            'public/cpp/utility/lib/mutex.cc',
-            'public/cpp/utility/lib/thread.cc',
-          ],
-        }],
-      ],
-      'include_dirs': [
-        '..',
-      ],
-    },
-    {
-      'target_name': 'mojo_application_bindings_mojom',
-      'type': 'none',
-      'variables': {
-        'mojom_files': [
-          'public/interfaces/application/application.mojom',
-          'public/interfaces/application/service_provider.mojom',
-          'public/interfaces/application/shell.mojom',
-        ],
-      },
-      'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
-    },
-    {
-      # GN version: //mojo/public/interfaces/application:application
-      'target_name': 'mojo_application_bindings',
-      'type': 'static_library',
-      'dependencies': [
-        'mojo_application_bindings_mojom',
-        'mojo_cpp_bindings',
-      ],
-      'export_dependent_settings': [
-        'mojo_cpp_bindings',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/application
-      'target_name': 'mojo_application_base',
-      'type': 'static_library',
-      'sources': [
-        'public/cpp/application/application_connection.h',
-        'public/cpp/application/application_delegate.h',
-        'public/cpp/application/application_impl.h',
-        'public/cpp/application/connect.h',
-        'public/cpp/application/interface_factory.h',
-        'public/cpp/application/interface_factory_impl.h',
-        'public/cpp/application/lib/application_connection.cc',
-        'public/cpp/application/lib/application_delegate.cc',
-        'public/cpp/application/lib/application_impl.cc',
-        'public/cpp/application/lib/service_provider_impl.cc',
-        'public/cpp/application/lib/service_connector.cc',
-        'public/cpp/application/lib/service_connector.h',
-        'public/cpp/application/lib/service_registry.cc',
-        'public/cpp/application/lib/service_registry.h',
-        'public/cpp/application/lib/weak_service_provider.cc',
-        'public/cpp/application/lib/weak_service_provider.h',
-        'public/cpp/application/service_provider_impl.h',
-      ],
-      'dependencies': [
-        'mojo_application_bindings',
-      ],
-      'export_dependent_settings': [
-        'mojo_application_bindings',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/application:standalone"
-      'target_name': 'mojo_application_standalone',
-      'type': 'static_library',
-      'sources': [
-        'public/cpp/application/lib/application_runner.cc',
-        'public/cpp/application/application_runner.h',
-      ],
-      'dependencies': [
-        'mojo_application_base',
-        'mojo_environment_standalone',
-      ],
-      'export_dependent_settings': [
-        'mojo_application_base',
-      ],
-    },
-    {
-      # GN version: //mojo/public/c/test_support
-      'target_name': 'mojo_test_support',
-      'defines': [
-        'MOJO_TEST_SUPPORT_IMPLEMENTATION',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '..',
-        ],
-      },
-      'sources': [
-        'public/c/test_support/test_support.h',
-        'public/c/test_support/test_support_export.h',
-        # TODO(vtl): Convert this to thunks http://crbug.com/386799
-        'public/tests/test_support_private.cc',
-        'public/tests/test_support_private.h',
-      ],
-      'conditions': [
-        ['OS=="ios"', {
-          'type': 'static_library',
-        }, {
-          'type': 'shared_library',
-        }],
-        ['OS=="mac"', {
-          'xcode_settings': {
-            # Make it a run-path dependent library.
-            'DYLIB_INSTALL_NAME_BASE': '@loader_path',
-          },
-        }],
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/test_support:test_utils
-      'target_name': 'mojo_public_test_utils',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../testing/gtest.gyp:gtest',
-        'mojo_test_support',
-      ],
-      'sources': [
-        'public/cpp/test_support/lib/test_support.cc',
-        'public/cpp/test_support/lib/test_utils.cc',
-        'public/cpp/test_support/test_utils.h',
-      ],
-    },
-    {
-      # GN version: //mojo/public/cpp/bindings/tests:mojo_public_bindings_test_utils
-      'target_name': 'mojo_public_bindings_test_utils',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-      ],
-      'sources': [
-        'public/cpp/bindings/tests/validation_test_input_parser.cc',
-        'public/cpp/bindings/tests/validation_test_input_parser.h',
-      ],
-    },
-    {
-      'target_name': 'mojo_public_test_interfaces_mojom',
-      'type': 'none',
-      'variables': {
-        'mojom_files': [
-          'public/interfaces/bindings/tests/math_calculator.mojom',
-          'public/interfaces/bindings/tests/no_module.mojom',
-          'public/interfaces/bindings/tests/rect.mojom',
-          'public/interfaces/bindings/tests/regression_tests.mojom',
-          'public/interfaces/bindings/tests/regression_tests_import.mojom',
-          'public/interfaces/bindings/tests/sample_factory.mojom',
-          'public/interfaces/bindings/tests/sample_import.mojom',
-          'public/interfaces/bindings/tests/sample_import2.mojom',
-          'public/interfaces/bindings/tests/sample_interfaces.mojom',
-          'public/interfaces/bindings/tests/sample_service.mojom',
-          'public/interfaces/bindings/tests/serialization_test_structs.mojom',
-          'public/interfaces/bindings/tests/test_structs.mojom',
-          'public/interfaces/bindings/tests/validation_test_interfaces.mojom',
-        ],
-      },
-      'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
-    },
-    {
-      # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces
-      'target_name': 'mojo_public_test_interfaces',
-      'type': 'static_library',
-      'export_dependent_settings': [
-        'mojo_cpp_bindings',
-      ],
-      'dependencies': [
-        'mojo_public_test_interfaces_mojom',
-        'mojo_cpp_bindings',
-      ],
-    },
-  ],
-  'conditions': [
-    ['OS == "android"', {
-      'targets': [
-        {
-          # GN version: //mojo/public/java_system
-          'target_name': 'mojo_public_java',
-          'type': 'none',
-          'variables': {
-            'java_in_dir': 'public/java/system',
-          },
-          'includes': [ '../build/java.gypi' ],
-        },
-        {
-        # GN version: //mojo/public/java_bindings
-          'target_name': 'mojo_bindings_java',
-          'type': 'none',
-          'variables': {
-            'java_in_dir': 'public/java/bindings',
-           },
-           'dependencies': [
-             'mojo_public_java',
-           ],
-           'includes': [ '../build/java.gypi' ],
-        },
-      ],
-    }],
-  ],
-}
diff --git a/mojo/mojo_public_gles2_for_loadable_module.gypi b/mojo/mojo_public_gles2_for_loadable_module.gypi
index 2f91651..31a350e 100644
--- a/mojo/mojo_public_gles2_for_loadable_module.gypi
+++ b/mojo/mojo_public_gles2_for_loadable_module.gypi
@@ -43,16 +43,16 @@
         ],
       },
       'sources': [
-        '<(DEPTH)/mojo/public/c/gles2/gles2.h',
-        '<(DEPTH)/mojo/public/c/gles2/gles2_export.h',
-        '<(DEPTH)/mojo/public/platform/native/gles2_thunks.cc',
-        '<(DEPTH)/mojo/public/platform/native/gles2_thunks.h',
-        '<(DEPTH)/mojo/public/platform/native/gles2_impl_thunks.cc',
-        '<(DEPTH)/mojo/public/platform/native/gles2_impl_thunks.h',
-        '<(DEPTH)/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.cc',
-        '<(DEPTH)/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.h',
-        '<(DEPTH)/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.cc',
-        '<(DEPTH)/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/c/gles2/gles2.h',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/c/gles2/gles2_export.h',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_thunks.cc',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_thunks.h',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.cc',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.h',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.cc',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.h',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.cc',
+        '<(DEPTH)/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h',
       ],
     }]
   ]
diff --git a/mojo/mojo_services_public.gyp b/mojo/mojo_services_public.gyp
index 5c4885e..b1454d5 100644
--- a/mojo/mojo_services_public.gyp
+++ b/mojo/mojo_services_public.gyp
@@ -4,8 +4,11 @@
 
 {
   'includes': [
-    'mojo_variables.gypi',
+    '../third_party/mojo/mojo_variables.gypi',
   ],
+  'variables': {
+    'mojo_sdk_root': '<(DEPTH)/third_party/mojo/src',
+  },
   'targets': [
     {
       'target_name': 'mojo_services_public',
@@ -31,17 +34,17 @@
       'target_name': 'mojo_clipboard_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/clipboard/public/interfaces/clipboard.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -49,21 +52,21 @@
       'target_name': 'mojo_input_events_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/input_events/public/interfaces/input_event_constants.mojom',
         'services/input_events/public/interfaces/input_events.mojom',
         'services/input_events/public/interfaces/input_key_codes.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_geometry_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_geometry_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -71,17 +74,17 @@
       'target_name': 'mojo_geometry_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/geometry/public/interfaces/geometry.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -89,7 +92,7 @@
       'target_name': 'mojo_gpu_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/gpu/public/interfaces/command_buffer.mojom',
@@ -97,14 +100,14 @@
         'services/gpu/public/interfaces/gpu_capabilities.mojom',
         'services/gpu/public/interfaces/viewport_parameter_listener.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_geometry_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_geometry_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -112,24 +115,24 @@
       'target_name': 'mojo_native_viewport_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/native_viewport/public/interfaces/native_viewport.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_geometry_bindings',
         'mojo_gpu_bindings',
         'mojo_input_events_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
       ],
       'export_dependent_settings': [
         'mojo_geometry_bindings',
         'mojo_gpu_bindings',
         'mojo_input_events_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
       ],
     },
@@ -138,18 +141,18 @@
       'target_name': 'mojo_navigation_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/navigation/public/interfaces/navigation.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'dependencies': [
         'mojo_network_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -157,19 +160,19 @@
       'target_name': 'mojo_content_handler_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/content_handler/public/interfaces/content_handler.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'dependencies': [
         'mojo_network_bindings',
-        'mojo_public.gyp:mojo_application_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -177,7 +180,7 @@
       'target_name': 'mojo_network_bindings',
       'type': 'static_library',
        'variables' : {
-         'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+         'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
        },
        'sources': [
         'services/network/public/interfaces/cookie_store.mojom',
@@ -191,12 +194,12 @@
         'services/network/public/interfaces/url_loader.mojom',
         'services/network/public/interfaces/web_socket.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'dependencies': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -212,27 +215,27 @@
       'target_name': 'mojo_view_manager_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/view_manager/public/interfaces/view_manager.mojom',
         'services/view_manager/public/interfaces/view_manager_constants.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_geometry_bindings',
         'mojo_input_events_bindings',
         'mojo_native_viewport_bindings',
-        'mojo_public.gyp:mojo_application_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
       ],
       'export_dependent_settings': [
         'mojo_geometry_bindings',
         'mojo_input_events_bindings',
         'mojo_native_viewport_bindings',
-        'mojo_public.gyp:mojo_application_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
       ],
     },
@@ -241,23 +244,23 @@
       'target_name': 'mojo_surfaces_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/surfaces/public/interfaces/surfaces.mojom',
         'services/surfaces/public/interfaces/surfaces_service.mojom',
         'services/surfaces/public/interfaces/quads.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_geometry_bindings',
         'mojo_gpu_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
       ],
       'export_dependent_settings': [
         'mojo_geometry_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'mojo_surface_id_bindings',
       ],
     },
@@ -266,17 +269,17 @@
       'target_name': 'mojo_surface_id_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/surfaces/public/interfaces/surface_id.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
     {
@@ -284,21 +287,21 @@
       'target_name': 'mojo_window_manager_bindings',
       'type': 'static_library',
       'variables': {
-        'mojom_import_args': [ '-I<(DEPTH)', '-Iservices' ],
+        'mojom_import_args': [ '-I<(mojo_sdk_root)', '-Iservices' ],
       },
       'sources': [
         'services/window_manager/public/interfaces/window_manager.mojom',
       ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
+      'includes': [ '../third_party/mojo/mojom_bindings_generator.gypi' ],
       'dependencies': [
         'mojo_input_events_bindings',
-        'mojo_public.gyp:mojo_application_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_input_events_bindings',
-        'mojo_public.gyp:mojo_application_bindings',
-        'mojo_public.gyp:mojo_cpp_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
+        '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
     },
   ],
diff --git a/mojo/mojom_bindings_generator_variables.gypi b/mojo/mojom_bindings_generator_variables.gypi
deleted file mode 100644
index 81b1a4b..0000000
--- a/mojo/mojom_bindings_generator_variables.gypi
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2014 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': {
-    'mojom_bindings_generator':
-        '<(DEPTH)/mojo/public/tools/bindings/mojom_bindings_generator.py',
-    'mojom_bindings_generator_sources': [
-      '<(mojom_bindings_generator)',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/enum_declaration.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/interface_declaration.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/interface_request_validator_declaration.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/interface_response_validator_declaration.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/params_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/struct_declaration.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/struct_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/struct_macros.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_declaration.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/constant_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/constants.java.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/enum_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/enum.java.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/header.java.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/interface.java.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/interface_internal.java.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/struct_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/struct.java.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/js_templates/enum_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/js_templates/module_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/js_templates/module.amd.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/js_templates/module.sky.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/python_templates/module_macros.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/python_templates/module.py.tmpl',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/mojom_cpp_generator.py',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/mojom_java_generator.py',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/mojom_js_generator.py',
-      '<(DEPTH)/mojo/public/tools/bindings/generators/mojom_python_generator.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/__init__.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/error.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/generate/__init__.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/generate/data.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/generate/generator.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/generate/module.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/generate/pack.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/parse/__init__.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/parse/ast.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/parse/lexer.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/parse/parser.py',
-      '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/parse/translate.py',
-    ]
-  }
-}
diff --git a/mojo/nacl/BUILD.gn b/mojo/nacl/BUILD.gn
index 4315245..3ce017d 100644
--- a/mojo/nacl/BUILD.gn
+++ b/mojo/nacl/BUILD.gn
@@ -52,7 +52,7 @@ if (!is_nacl) {
     ]
     deps = [
       "//base:base",
-      "//mojo/edk/system:system",
+      "//third_party/mojo/src/mojo/edk/system:system",
       ":monacl_sel",
     ]
   }
@@ -74,15 +74,15 @@ if (is_nacl) {
   executable("monacl_test") {
     testonly = true
     sources = [
-      "//mojo/public/cpp/system/tests/core_unittest.cc",
-      "//mojo/public/cpp/system/tests/macros_unittest.cc",
+      "//third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest.cc",
+      "//third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc",
     ]
     deps = [
       "//native_client/src/untrusted/nacl:imc_syscalls",
-      "//mojo/public/c/system/tests:tests",
-      "//mojo/public/cpp/system:system",
       "//testing/gtest:gtest",
       "//testing/gtest:gtest_main",
+      "//third_party/mojo/src/mojo/public/c/system/tests:tests",
+      "//third_party/mojo/src/mojo/public/cpp/system:system",
       ":mojo",
     ]
   }
diff --git a/mojo/public/VERSION b/mojo/public/VERSION
deleted file mode 100644
index 3ee95c5..0000000
--- a/mojo/public/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-b737c0531e299ad494725c518699843e76ff84f5
diff --git a/mojo/services/html_viewer/BUILD.gn b/mojo/services/html_viewer/BUILD.gn
index 6eaba5e..d802032 100644
--- a/mojo/services/html_viewer/BUILD.gn
+++ b/mojo/services/html_viewer/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/mojo.gni")
-import("//mojo/public/mojo_application.gni")
+import("//third_party/mojo/src/mojo/public/mojo.gni")
+import("//third_party/mojo/src/mojo/public/mojo_application.gni")
 
 action("generate_blink_resource_map") {
   script = "//mojo/services/html_viewer/generate_blink_resource_map.py"
@@ -81,9 +81,6 @@ source_set("lib") {
     "//mojo/cc",
     "//mojo/common",
     "//mojo/converters/surfaces",
-    "//mojo/public/c/system:for_shared_library",
-    "//mojo/public/cpp/utility",
-    "//mojo/public/interfaces/application",
     "//mojo/services/network/public/cpp",
     "//mojo/services/accessibility/public/interfaces",
     "//mojo/services/clipboard/public/interfaces",
@@ -95,14 +92,17 @@ source_set("lib") {
     "//mojo/services/surfaces/public/interfaces",
     "//net",
     "//skia",
+    "//third_party/mojo/src/mojo/public/c/system:for_shared_library",
+    "//third_party/mojo/src/mojo/public/cpp/utility",
+    "//third_party/mojo/src/mojo/public/interfaces/application",
     "//ui/native_theme",
     "//url",
   ]
 
   public_deps = [
-    "//mojo/public/cpp/bindings",
     "//mojo/services/view_manager/public/cpp",
     "//third_party/WebKit/public:blink",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
     ":generate_blink_resource_map",
   ]
 }
diff --git a/mojo/services/mojo_sdk_root.gni b/mojo/services/mojo_sdk_root.gni
index c405ca1..1d31dcc 100644
--- a/mojo/services/mojo_sdk_root.gni
+++ b/mojo/services/mojo_sdk_root.gni
@@ -3,4 +3,4 @@
 # found in the LICENSE file.
 
 # This variable should point to the parent directory of the Mojo SDK.
-mojo_sdk_root = "//"
+mojo_sdk_root = "//third_party/mojo/src"
diff --git a/mojo/services/network/BUILD.gn b/mojo/services/network/BUILD.gn
index df26015..856525e 100644
--- a/mojo/services/network/BUILD.gn
+++ b/mojo/services/network/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/mojo_application.gni")
+import("//third_party/mojo/src/mojo/public/mojo_application.gni")
 
 mojo_native_application("network") {
   output_name = "network_service"
@@ -11,9 +11,9 @@ mojo_native_application("network") {
     ":lib",
     "//base",
     "//mojo/application",
-    "//mojo/public/c/system:for_shared_library",
-    "//mojo/public/cpp/bindings:bindings",
     "//mojo/services/network/public/interfaces",
+    "//third_party/mojo/src/mojo/public/c/system:for_shared_library",
+    "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
   ]
 
   sources = [
diff --git a/ppapi/ppapi_tests_mojo.gyp b/ppapi/ppapi_tests_mojo.gyp
index 63a3e3a..794a8b6 100644
--- a/ppapi/ppapi_tests_mojo.gyp
+++ b/ppapi/ppapi_tests_mojo.gyp
@@ -41,8 +41,8 @@
       'dependencies': [
         '../mojo/mojo_nacl_untrusted.gyp:libmojo',
         '../mojo/mojo_nacl.gyp:monacl_codegen',
-        '../mojo/mojo_public.gyp:mojo_system_placeholder',
         '../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
+        '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder',
         'native_client/native_client.gyp:ppapi_lib',
         'ppapi_nacl.gyp:ppapi_cpp_lib',
       ],
diff --git a/third_party/mojo/LICENSE b/third_party/mojo/LICENSE
new file mode 100644
index 0000000..972bb2e
--- /dev/null
+++ b/third_party/mojo/LICENSE
@@ -0,0 +1,27 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/third_party/mojo/README.chromium b/third_party/mojo/README.chromium
new file mode 100644
index 0000000..e912cb6
--- /dev/null
+++ b/third_party/mojo/README.chromium
@@ -0,0 +1,15 @@
+Name: Mojo
+Short Name: mojo
+URL: https://github.com/domokit/mojo
+Version: Unknown
+Security Critical: Yes
+License: Chromium
+License Android Compatible: yes
+
+Description:
+Mojo is an effort to extract a common platform out of Chrome's renderer and
+plugin processes that can support multiple types of sandboxed content, such as
+HTML, Pepper, or NaCl.
+
+Local Modifications:
+None.
diff --git a/mojo/mojo_edk.gyp b/third_party/mojo/mojo_edk.gyp
index 68b2aff..01edb62 100644
--- a/mojo/mojo_edk.gyp
+++ b/third_party/mojo/mojo_edk.gyp
@@ -6,14 +6,24 @@
   'includes': [
     'mojo_variables.gypi',
   ],
+  'target_defaults' : {
+    'include_dirs': [
+      'src',
+    ],
+    'direct_dependent_settings': {
+      'include_dirs': [
+        'src',
+      ],
+    },
+  },
   'targets': [
     {
       # GN version: //mojo/edk/system
       'target_name': 'mojo_system_impl',
       'type': '<(component)',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../../base/base.gyp:base',
+        '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
       ],
       'includes': [
         'mojo_edk_system_impl.gypi',
@@ -24,31 +34,31 @@
       'target_name': 'mojo_js_lib',
       'type': 'static_library',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../gin/gin.gyp:gin',
-        '../v8/tools/gyp/v8.gyp:v8',
+        '../../base/base.gyp:base',
+        '../../gin/gin.gyp:gin',
+        '../../v8/tools/gyp/v8.gyp:v8',
       ],
       'export_dependent_settings': [
-        '../base/base.gyp:base',
-        '../gin/gin.gyp:gin',
+        '../../base/base.gyp:base',
+        '../../gin/gin.gyp:gin',
       ],
       'sources': [
         # Sources list duplicated in GN build.
-        'edk/js/core.cc',
-        'edk/js/core.h',
-        'edk/js/drain_data.cc',
-        'edk/js/drain_data.h',
-        'edk/js/handle.cc',
-        'edk/js/handle.h',
-        'edk/js/handle_close_observer.h',
-        'edk/js/mojo_runner_delegate.cc',
-        'edk/js/mojo_runner_delegate.h',
-        'edk/js/support.cc',
-        'edk/js/support.h',
-        'edk/js/threading.cc',
-        'edk/js/threading.h',
-        'edk/js/waiting_callback.cc',
-        'edk/js/waiting_callback.h',
+        'src/mojo/edk/js/core.cc',
+        'src/mojo/edk/js/core.h',
+        'src/mojo/edk/js/drain_data.cc',
+        'src/mojo/edk/js/drain_data.h',
+        'src/mojo/edk/js/handle.cc',
+        'src/mojo/edk/js/handle.h',
+        'src/mojo/edk/js/handle_close_observer.h',
+        'src/mojo/edk/js/mojo_runner_delegate.cc',
+        'src/mojo/edk/js/mojo_runner_delegate.h',
+        'src/mojo/edk/js/support.cc',
+        'src/mojo/edk/js/support.h',
+        'src/mojo/edk/js/threading.cc',
+        'src/mojo/edk/js/threading.h',
+        'src/mojo/edk/js/waiting_callback.cc',
+        'src/mojo/edk/js/waiting_callback.h',
       ],
     },
     {
@@ -56,11 +66,11 @@
       'target_name': 'mojo_test_support_impl',
       'type': 'static_library',
       'dependencies': [
-        '../base/base.gyp:base',
+        '../../base/base.gyp:base',
       ],
       'sources': [
-        'edk/test/test_support_impl.cc',
-        'edk/test/test_support_impl.h',
+        'src/mojo/edk/test/test_support_impl.cc',
+        'src/mojo/edk/test/test_support_impl.h',
       ],
     },
     {
@@ -68,22 +78,22 @@
       'target_name': 'mojo_common_test_support',
       'type': 'static_library',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../testing/gtest.gyp:gtest',
+        '../../base/base.gyp:base',
+        '../../base/base.gyp:test_support_base',
+        '../../testing/gtest.gyp:gtest',
         'mojo_system_impl',
       ],
       'sources': [
-        'edk/test/multiprocess_test_helper.cc',
-        'edk/test/multiprocess_test_helper.h',
-        'edk/test/test_utils.h',
-        'edk/test/test_utils_posix.cc',
-        'edk/test/test_utils_win.cc',
+        'src/mojo/edk/test/multiprocess_test_helper.cc',
+        'src/mojo/edk/test/multiprocess_test_helper.h',
+        'src/mojo/edk/test/test_utils.h',
+        'src/mojo/edk/test/test_utils_posix.cc',
+        'src/mojo/edk/test/test_utils_win.cc',
       ],
       'conditions': [
         ['OS=="ios"', {
           'sources!': [
-            'edk/test/multiprocess_test_helper.cc',
+            'src/mojo/edk/test/multiprocess_test_helper.cc',
           ],
         }],
       ],
@@ -93,15 +103,15 @@
       'target_name': 'mojo_run_all_unittests',
       'type': 'static_library',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../testing/gtest.gyp:gtest',
+        '../../base/base.gyp:base',
+        '../../base/base.gyp:test_support_base',
+        '../../testing/gtest.gyp:gtest',
         'mojo_system_impl',
         'mojo_public.gyp:mojo_test_support',
         'mojo_test_support_impl',
       ],
       'sources': [
-        'edk/test/run_all_unittests.cc',
+        'src/mojo/edk/test/run_all_unittests.cc',
       ],
     },
     {
@@ -109,13 +119,13 @@
       'target_name': 'mojo_run_all_perftests',
       'type': 'static_library',
       'dependencies': [
-        '../base/base.gyp:test_support_base',
+        '../../base/base.gyp:test_support_base',
         'mojo_edk.gyp:mojo_system_impl',
         'mojo_public.gyp:mojo_test_support',
         'mojo_test_support_impl',
       ],
       'sources': [
-        'edk/test/run_all_perftests.cc',
+        'src/mojo/edk/test/run_all_perftests.cc',
       ],
     },
   ],
@@ -126,8 +136,8 @@
           'target_name': 'mojo_system_impl_win64',
           'type': '<(component)',
           'dependencies': [
-            '../base/base.gyp:base_win64',
-            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
+            '../../base/base.gyp:base_win64',
+            '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
           ],
           'includes': [
             'mojo_edk_system_impl.gypi',
diff --git a/third_party/mojo/mojo_edk_system_impl.gypi b/third_party/mojo/mojo_edk_system_impl.gypi
new file mode 100644
index 0000000..50991bf
--- /dev/null
+++ b/third_party/mojo/mojo_edk_system_impl.gypi
@@ -0,0 +1,133 @@
+# Copyright (c) 2014 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.
+
+# The dictionary here is defined for use by the "mojo_system_impl" and
+# "mojo_system_impl_win64" targets in third_party/mojo/mojo_edk.gyp. It's defined in this
+# .gypi file so the sections aren't duplicated.
+{
+  'defines': [
+    'MOJO_SYSTEM_IMPL_IMPLEMENTATION',
+    'MOJO_SYSTEM_IMPLEMENTATION',
+    'MOJO_USE_SYSTEM_IMPL',
+  ],
+  'sources': [
+    'src/mojo/edk/embedder/configuration.h',
+    'src/mojo/edk/embedder/channel_info_forward.h',
+    'src/mojo/edk/embedder/channel_init.cc',
+    'src/mojo/edk/embedder/channel_init.h',
+    'src/mojo/edk/embedder/embedder.cc',
+    'src/mojo/edk/embedder/embedder.h',
+    'src/mojo/edk/embedder/embedder_internal.h',
+    'src/mojo/edk/embedder/entrypoints.cc',
+    'src/mojo/edk/embedder/platform_channel_pair.cc',
+    'src/mojo/edk/embedder/platform_channel_pair.h',
+    'src/mojo/edk/embedder/platform_channel_pair_posix.cc',
+    'src/mojo/edk/embedder/platform_channel_pair_win.cc',
+    'src/mojo/edk/embedder/platform_channel_utils_posix.cc',
+    'src/mojo/edk/embedder/platform_channel_utils_posix.h',
+    'src/mojo/edk/embedder/platform_handle.cc',
+    'src/mojo/edk/embedder/platform_handle.h',
+    'src/mojo/edk/embedder/platform_handle_utils.h',
+    'src/mojo/edk/embedder/platform_handle_utils_posix.cc',
+    'src/mojo/edk/embedder/platform_handle_utils_win.cc',
+    'src/mojo/edk/embedder/platform_handle_vector.h',
+    'src/mojo/edk/embedder/platform_shared_buffer.h',
+    'src/mojo/edk/embedder/platform_support.h',
+    'src/mojo/edk/embedder/scoped_platform_handle.h',
+    'src/mojo/edk/embedder/simple_platform_shared_buffer.cc',
+    'src/mojo/edk/embedder/simple_platform_shared_buffer.h',
+    'src/mojo/edk/embedder/simple_platform_shared_buffer_android.cc',
+    'src/mojo/edk/embedder/simple_platform_shared_buffer_posix.cc',
+    'src/mojo/edk/embedder/simple_platform_shared_buffer_win.cc',
+    'src/mojo/edk/embedder/simple_platform_support.cc',
+    'src/mojo/edk/embedder/simple_platform_support.h',
+    'src/mojo/edk/system/awakable.h',
+    'src/mojo/edk/system/awakable_list.cc',
+    'src/mojo/edk/system/awakable_list.h',
+    'src/mojo/edk/system/async_waiter.cc',
+    'src/mojo/edk/system/async_waiter.h',
+    'src/mojo/edk/system/channel.cc',
+    'src/mojo/edk/system/channel.h',
+    'src/mojo/edk/system/channel_endpoint.cc',
+    'src/mojo/edk/system/channel_endpoint.h',
+    'src/mojo/edk/system/channel_endpoint_client.h',
+    'src/mojo/edk/system/channel_endpoint_id.cc',
+    'src/mojo/edk/system/channel_endpoint_id.h',
+    'src/mojo/edk/system/channel_info.cc',
+    'src/mojo/edk/system/channel_info.h',
+    'src/mojo/edk/system/channel_manager.cc',
+    'src/mojo/edk/system/channel_manager.h',
+    'src/mojo/edk/system/configuration.cc',
+    'src/mojo/edk/system/configuration.h',
+    'src/mojo/edk/system/core.cc',
+    'src/mojo/edk/system/core.h',
+    'src/mojo/edk/system/data_pipe.cc',
+    'src/mojo/edk/system/data_pipe.h',
+    'src/mojo/edk/system/data_pipe_consumer_dispatcher.cc',
+    'src/mojo/edk/system/data_pipe_consumer_dispatcher.h',
+    'src/mojo/edk/system/data_pipe_producer_dispatcher.cc',
+    'src/mojo/edk/system/data_pipe_producer_dispatcher.h',
+    'src/mojo/edk/system/dispatcher.cc',
+    'src/mojo/edk/system/dispatcher.h',
+    'src/mojo/edk/system/endpoint_relayer.cc',
+    'src/mojo/edk/system/endpoint_relayer.h',
+    'src/mojo/edk/system/handle_signals_state.h',
+    'src/mojo/edk/system/handle_table.cc',
+    'src/mojo/edk/system/handle_table.h',
+    'src/mojo/edk/system/incoming_endpoint.cc',
+    'src/mojo/edk/system/incoming_endpoint.h',
+    'src/mojo/edk/system/local_data_pipe.cc',
+    'src/mojo/edk/system/local_data_pipe.h',
+    'src/mojo/edk/system/local_message_pipe_endpoint.cc',
+    'src/mojo/edk/system/local_message_pipe_endpoint.h',
+    'src/mojo/edk/system/mapping_table.cc',
+    'src/mojo/edk/system/mapping_table.h',
+    'src/mojo/edk/system/memory.cc',
+    'src/mojo/edk/system/memory.h',
+    'src/mojo/edk/system/message_in_transit.cc',
+    'src/mojo/edk/system/message_in_transit.h',
+    'src/mojo/edk/system/message_in_transit_queue.cc',
+    'src/mojo/edk/system/message_in_transit_queue.h',
+    'src/mojo/edk/system/message_pipe.cc',
+    'src/mojo/edk/system/message_pipe.h',
+    'src/mojo/edk/system/message_pipe_dispatcher.cc',
+    'src/mojo/edk/system/message_pipe_dispatcher.h',
+    'src/mojo/edk/system/message_pipe_endpoint.cc',
+    'src/mojo/edk/system/message_pipe_endpoint.h',
+    'src/mojo/edk/system/options_validation.h',
+    'src/mojo/edk/system/platform_handle_dispatcher.cc',
+    'src/mojo/edk/system/platform_handle_dispatcher.h',
+    'src/mojo/edk/system/proxy_message_pipe_endpoint.cc',
+    'src/mojo/edk/system/proxy_message_pipe_endpoint.h',
+    'src/mojo/edk/system/raw_channel.cc',
+    'src/mojo/edk/system/raw_channel.h',
+    'src/mojo/edk/system/raw_channel_posix.cc',
+    'src/mojo/edk/system/raw_channel_win.cc',
+    'src/mojo/edk/system/shared_buffer_dispatcher.cc',
+    'src/mojo/edk/system/shared_buffer_dispatcher.h',
+    'src/mojo/edk/system/simple_dispatcher.cc',
+    'src/mojo/edk/system/simple_dispatcher.h',
+    'src/mojo/edk/system/transport_data.cc',
+    'src/mojo/edk/system/transport_data.h',
+    'src/mojo/edk/system/waiter.cc',
+    'src/mojo/edk/system/waiter.h',
+    # Test-only code:
+    # TODO(vtl): It's a little unfortunate that these end up in the same
+    # component as non-test-only code. In the static build, this code
+    # should hopefully be dead-stripped.
+    'src/mojo/edk/embedder/test_embedder.cc',
+    'src/mojo/edk/embedder/test_embedder.h',
+  ],
+  'all_dependent_settings': {
+    # Ensures that dependent projects import the core functions on Windows.
+    'defines': ['MOJO_USE_SYSTEM_IMPL'],
+  },
+  'conditions': [
+    ['OS=="android"', {
+      'dependencies': [
+        '<(DEPTH)/third_party/ashmem/ashmem.gyp:ashmem',
+      ],
+    }],
+  ],
+}
diff --git a/mojo/mojo_edk_tests.gyp b/third_party/mojo/mojo_edk_tests.gyp
index f3809b4..91a777f 100644
--- a/mojo/mojo_edk_tests.gyp
+++ b/third_party/mojo/mojo_edk_tests.gyp
@@ -34,7 +34,7 @@
       'target_name': 'mojo_public_bindings_unittests',
       'type': 'executable',
       'dependencies': [
-        '../testing/gtest.gyp:gtest',
+        '../../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_public.gyp:mojo_cpp_bindings',
         'mojo_public.gyp:mojo_environment_standalone',
@@ -44,23 +44,23 @@
         'mojo_public.gyp:mojo_utility',
       ],
       'sources': [
-        'public/cpp/bindings/tests/array_unittest.cc',
-        'public/cpp/bindings/tests/bounds_checker_unittest.cc',
-        'public/cpp/bindings/tests/buffer_unittest.cc',
-        'public/cpp/bindings/tests/connector_unittest.cc',
-        'public/cpp/bindings/tests/container_test_util.cc',
-        'public/cpp/bindings/tests/equals_unittest.cc',
-        'public/cpp/bindings/tests/handle_passing_unittest.cc',
-        'public/cpp/bindings/tests/interface_ptr_unittest.cc',
-        'public/cpp/bindings/tests/map_unittest.cc',
-        'public/cpp/bindings/tests/request_response_unittest.cc',
-        'public/cpp/bindings/tests/router_unittest.cc',
-        'public/cpp/bindings/tests/sample_service_unittest.cc',
-        'public/cpp/bindings/tests/serialization_warning_unittest.cc',
-        'public/cpp/bindings/tests/string_unittest.cc',
-        'public/cpp/bindings/tests/struct_unittest.cc',
-        'public/cpp/bindings/tests/type_conversion_unittest.cc',
-        'public/cpp/bindings/tests/validation_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/array_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/buffer_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/connector_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/container_test_util.cc',
+        'src/mojo/public/cpp/bindings/tests/equals_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/map_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/request_response_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/router_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/sample_service_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/string_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/struct_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc',
+        'src/mojo/public/cpp/bindings/tests/validation_unittest.cc',
       ],
     },
     {
@@ -68,18 +68,18 @@
       'target_name': 'mojo_public_environment_unittests',
       'type': 'executable',
       'dependencies': [
-        '../testing/gtest.gyp:gtest',
+        '../../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_public.gyp:mojo_environment_standalone',
         'mojo_public.gyp:mojo_public_test_utils',
         'mojo_public.gyp:mojo_utility',
       ],
-      'include_dirs': [ '..' ],
+      'include_dirs': [ '../..' ],
       'sources': [
-        'public/cpp/environment/tests/async_wait_unittest.cc',
-        'public/cpp/environment/tests/async_waiter_unittest.cc',
-        'public/cpp/environment/tests/logger_unittest.cc',
-        'public/cpp/environment/tests/logging_unittest.cc',
+        'src/mojo/public/cpp/environment/tests/async_wait_unittest.cc',
+        'src/mojo/public/cpp/environment/tests/async_waiter_unittest.cc',
+        'src/mojo/public/cpp/environment/tests/logger_unittest.cc',
+        'src/mojo/public/cpp/environment/tests/logging_unittest.cc',
       ],
     },
     {
@@ -87,15 +87,15 @@
       'target_name': 'mojo_public_application_unittests',
       'type': 'executable',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../testing/gtest.gyp:gtest',
+        '../../base/base.gyp:base',
+        '../../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_public.gyp:mojo_application_standalone',
         'mojo_public.gyp:mojo_utility',
         'mojo_public.gyp:mojo_environment_standalone',
       ],
       'sources': [
-        'public/cpp/application/tests/service_registry_unittest.cc',
+        'src/mojo/public/cpp/application/tests/service_registry_unittest.cc',
       ],
     },
     {
@@ -104,11 +104,11 @@
       'target_name': 'mojo_public_system_unittests',
       'type': 'executable',
       'dependencies': [
-        '../testing/gtest.gyp:gtest',
+        '../../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_public.gyp:mojo_public_test_utils',
       ],
-      'include_dirs': [ '..' ],
+      'include_dirs': [ '../..' ],
       'sources': [
         '<@(mojo_public_system_unittest_sources)',
       ],
@@ -118,23 +118,23 @@
       'target_name': 'mojo_public_utility_unittests',
       'type': 'executable',
       'dependencies': [
-        '../testing/gtest.gyp:gtest',
+        '../../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_public.gyp:mojo_public_test_utils',
         'mojo_public.gyp:mojo_utility',
       ],
-      'include_dirs': [ '..' ],
+      'include_dirs': [ '../..' ],
       'sources': [
-        'public/cpp/utility/tests/mutex_unittest.cc',
-        'public/cpp/utility/tests/run_loop_unittest.cc',
-        'public/cpp/utility/tests/thread_unittest.cc',
+        'src/mojo/public/cpp/utility/tests/mutex_unittest.cc',
+        'src/mojo/public/cpp/utility/tests/run_loop_unittest.cc',
+        'src/mojo/public/cpp/utility/tests/thread_unittest.cc',
       ],
       'conditions': [
         # See crbug.com/342893:
         ['OS=="win"', {
           'sources!': [
-            'public/cpp/utility/tests/mutex_unittest.cc',
-            'public/cpp/utility/tests/thread_unittest.cc',
+            'src/mojo/public/cpp/utility/tests/mutex_unittest.cc',
+            'src/mojo/public/cpp/utility/tests/thread_unittest.cc',
           ],
         }],
       ],
@@ -144,14 +144,14 @@
       'target_name': 'mojo_public_system_perftests',
       'type': 'executable',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../testing/gtest.gyp:gtest',
+        '../../base/base.gyp:base',
+        '../../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_run_all_perftests',
         'mojo_public.gyp:mojo_public_test_utils',
         'mojo_public.gyp:mojo_utility',
       ],
       'sources': [
-        'public/c/system/tests/core_perftest.cc',
+        'src/mojo/public/c/system/tests/core_perftest.cc',
       ],
     },
     {
@@ -159,51 +159,51 @@
       'target_name': 'mojo_system_unittests',
       'type': 'executable',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../testing/gtest.gyp:gtest',
+        '../../base/base.gyp:base',
+        '../../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_common_test_support',
         'mojo_edk.gyp:mojo_system_impl',
       ],
       'sources': [
-        'edk/embedder/embedder_unittest.cc',
-        'edk/embedder/platform_channel_pair_posix_unittest.cc',
-        'edk/embedder/simple_platform_shared_buffer_unittest.cc',
-        'edk/system/awakable_list_unittest.cc',
-        'edk/system/channel_endpoint_id_unittest.cc',
-        'edk/system/channel_manager_unittest.cc',
-        'edk/system/channel_unittest.cc',
-        'edk/system/core_unittest.cc',
-        'edk/system/core_test_base.cc',
-        'edk/system/core_test_base.h',
-        'edk/system/data_pipe_unittest.cc',
-        'edk/system/dispatcher_unittest.cc',
-        'edk/system/local_data_pipe_unittest.cc',
-        'edk/system/memory_unittest.cc',
-        'edk/system/message_pipe_dispatcher_unittest.cc',
-        'edk/system/message_pipe_test_utils.h',
-        'edk/system/message_pipe_test_utils.cc',
-        'edk/system/message_pipe_unittest.cc',
-        'edk/system/multiprocess_message_pipe_unittest.cc',
-        'edk/system/options_validation_unittest.cc',
-        'edk/system/platform_handle_dispatcher_unittest.cc',
-        'edk/system/raw_channel_unittest.cc',
-        'edk/system/remote_message_pipe_unittest.cc',
-        'edk/system/run_all_unittests.cc',
-        'edk/system/shared_buffer_dispatcher_unittest.cc',
-        'edk/system/simple_dispatcher_unittest.cc',
-        'edk/system/test_utils.cc',
-        'edk/system/test_utils.h',
-        'edk/system/waiter_test_utils.cc',
-        'edk/system/waiter_test_utils.h',
-        'edk/system/waiter_unittest.cc',
-        'edk/test/multiprocess_test_helper_unittest.cc',
+        'src/mojo/edk/embedder/embedder_unittest.cc',
+        'src/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc',
+        'src/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc',
+        'src/mojo/edk/system/awakable_list_unittest.cc',
+        'src/mojo/edk/system/channel_endpoint_id_unittest.cc',
+        'src/mojo/edk/system/channel_manager_unittest.cc',
+        'src/mojo/edk/system/channel_unittest.cc',
+        'src/mojo/edk/system/core_unittest.cc',
+        'src/mojo/edk/system/core_test_base.cc',
+        'src/mojo/edk/system/core_test_base.h',
+        'src/mojo/edk/system/data_pipe_unittest.cc',
+        'src/mojo/edk/system/dispatcher_unittest.cc',
+        'src/mojo/edk/system/local_data_pipe_unittest.cc',
+        'src/mojo/edk/system/memory_unittest.cc',
+        'src/mojo/edk/system/message_pipe_dispatcher_unittest.cc',
+        'src/mojo/edk/system/message_pipe_test_utils.h',
+        'src/mojo/edk/system/message_pipe_test_utils.cc',
+        'src/mojo/edk/system/message_pipe_unittest.cc',
+        'src/mojo/edk/system/multiprocess_message_pipe_unittest.cc',
+        'src/mojo/edk/system/options_validation_unittest.cc',
+        'src/mojo/edk/system/platform_handle_dispatcher_unittest.cc',
+        'src/mojo/edk/system/raw_channel_unittest.cc',
+        'src/mojo/edk/system/remote_message_pipe_unittest.cc',
+        'src/mojo/edk/system/run_all_unittests.cc',
+        'src/mojo/edk/system/shared_buffer_dispatcher_unittest.cc',
+        'src/mojo/edk/system/simple_dispatcher_unittest.cc',
+        'src/mojo/edk/system/test_utils.cc',
+        'src/mojo/edk/system/test_utils.h',
+        'src/mojo/edk/system/waiter_test_utils.cc',
+        'src/mojo/edk/system/waiter_test_utils.h',
+        'src/mojo/edk/system/waiter_unittest.cc',
+        'src/mojo/edk/test/multiprocess_test_helper_unittest.cc',
       ],
       'conditions': [
         ['OS=="ios"', {
           'sources!': [
-            'edk/embedder/embedder_unittest.cc',
-            'edk/system/multiprocess_message_pipe_unittest.cc',
-            'edk/test/multiprocess_test_helper_unittest.cc',
+            'src/mojo/edk/embedder/embedder_unittest.cc',
+            'src/mojo/edk/system/multiprocess_message_pipe_unittest.cc',
+            'src/mojo/edk/test/multiprocess_test_helper_unittest.cc',
           ],
         }],
       ],
@@ -213,19 +213,19 @@
       'target_name': 'mojo_message_pipe_perftests',
       'type': 'executable',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../base/base.gyp:test_support_perf',
-        '../testing/gtest.gyp:gtest',
+        '../../base/base.gyp:base',
+        '../../base/base.gyp:test_support_base',
+        '../../base/base.gyp:test_support_perf',
+        '../../testing/gtest.gyp:gtest',
         'mojo_edk.gyp:mojo_common_test_support',
         'mojo_edk.gyp:mojo_system_impl',
       ],
       'sources': [
-        'edk/system/message_pipe_perftest.cc',
-        'edk/system/message_pipe_test_utils.h',
-        'edk/system/message_pipe_test_utils.cc',
-        'edk/system/test_utils.cc',
-        'edk/system/test_utils.h',
+        'src/mojo/edk/system/message_pipe_perftest.cc',
+        'src/mojo/edk/system/message_pipe_test_utils.h',
+        'src/mojo/edk/system/message_pipe_test_utils.cc',
+        'src/mojo/edk/system/test_utils.cc',
+        'src/mojo/edk/system/test_utils.h',
       ],
     },
     {
@@ -233,7 +233,7 @@
       'target_name': 'mojo_js_unittests',
       'type': 'executable',
       'dependencies': [
-        '../gin/gin.gyp:gin_test',
+        '../../gin/gin.gyp:gin_test',
         'mojo_edk.gyp:mojo_common_test_support',
         'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_edk.gyp:mojo_js_lib',
@@ -242,8 +242,8 @@
         'mojo_public.gyp:mojo_utility',
       ],
       'sources': [
-        'edk/js/handle_unittest.cc',
-        'edk/js/test/run_js_tests.cc',
+        'src/mojo/edk/js/handle_unittest.cc',
+        'src/mojo/edk/js/test/run_js_tests.cc',
       ],
     },
     {
@@ -251,8 +251,8 @@
       'target_name': 'mojo_js_integration_tests',
       'type': 'executable',
       'dependencies': [
-        '../base/base.gyp:base',
-        '../gin/gin.gyp:gin_test',
+        '../../base/base.gyp:base',
+        '../../gin/gin.gyp:gin_test',
         'mojo_public.gyp:mojo_environment_standalone',
         'mojo_public.gyp:mojo_public_test_interfaces',
         'mojo_public.gyp:mojo_utility',
@@ -261,8 +261,8 @@
         'mojo_js_to_cpp_bindings',
       ],
       'sources': [
-        'edk/js/test/run_js_integration_tests.cc',
-        'edk/js/tests/js_to_cpp_tests',
+        'src/mojo/edk/js/test/run_js_integration_tests.cc',
+        'src/mojo/edk/js/tests/js_to_cpp_tests',
       ],
     },
     {
@@ -270,7 +270,7 @@
       'type': 'none',
       'variables': {
         'mojom_files': [
-          'edk/js/tests/js_to_cpp.mojom',
+          'src/mojo/edk/js/tests/js_to_cpp.mojom',
         ],
       },
       'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
diff --git a/third_party/mojo/mojo_public.gyp b/third_party/mojo/mojo_public.gyp
new file mode 100644
index 0000000..3114ac9
--- /dev/null
+++ b/third_party/mojo/mojo_public.gyp
@@ -0,0 +1,391 @@
+# Copyright 2014 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.
+
+{
+  'includes': [
+    'mojo_variables.gypi',
+  ],
+  'target_defaults' : {
+    'include_dirs': [
+      'src',
+    ],
+    'direct_dependent_settings': {
+      'include_dirs': [
+        'src',
+      ],
+    },
+  },
+  'targets': [
+    {
+      'target_name': 'mojo_public',
+      'type': 'none',
+      'dependencies': [
+        'mojo_js_bindings',
+        'mojo_public_test_interfaces',
+        'mojo_public_test_utils',
+        'mojo_system',
+        'mojo_utility',
+      ],
+    },
+    {
+      # Targets that (a) need to obtain the settings that mojo_system passes on
+      # to its direct dependents but (b) are not themselves in a position to
+      # hardcode a dependency to mojo_system vs. mojo_system_impl (e.g.,
+      # because they are components) should depend on this target.
+      'target_name': 'mojo_system_placeholder',
+      'type': 'none',
+    },
+    {
+      # GN version: //mojo/public/c/system
+      'target_name': 'mojo_system',
+      'type': 'static_library',
+      'defines': [
+        'MOJO_SYSTEM_IMPLEMENTATION',
+      ],
+      'all_dependent_settings': {
+        'conditions': [
+          # We need to be able to call the MojoSetSystemThunks() function in
+          # system_thunks.cc
+          ['OS=="android"', {
+            'ldflags!': [
+              '-Wl,--exclude-libs=ALL',
+            ],
+          }],
+        ],
+      },
+      'sources': [
+        'src/mojo/public/c/system/buffer.h',
+        'src/mojo/public/c/system/core.h',
+        'src/mojo/public/c/system/data_pipe.h',
+        'src/mojo/public/c/system/functions.h',
+        'src/mojo/public/c/system/macros.h',
+        'src/mojo/public/c/system/message_pipe.h',
+        'src/mojo/public/c/system/system_export.h',
+        'src/mojo/public/c/system/types.h',
+        'src/mojo/public/platform/native/system_thunks.cc',
+        'src/mojo/public/platform/native/system_thunks.h',
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/bindings
+      'target_name': 'mojo_cpp_bindings',
+      'type': 'static_library',
+      'include_dirs': [
+        '../..'
+      ],
+      'sources': [
+        'src/mojo/public/cpp/bindings/array.h',
+        'src/mojo/public/cpp/bindings/binding.h',
+        'src/mojo/public/cpp/bindings/callback.h',
+        'src/mojo/public/cpp/bindings/error_handler.h',
+        'src/mojo/public/cpp/bindings/interface_impl.h',
+        'src/mojo/public/cpp/bindings/interface_ptr.h',
+        'src/mojo/public/cpp/bindings/interface_request.h',
+        'src/mojo/public/cpp/bindings/message.h',
+        'src/mojo/public/cpp/bindings/message_filter.h',
+        'src/mojo/public/cpp/bindings/no_interface.h',
+        'src/mojo/public/cpp/bindings/string.h',
+        'src/mojo/public/cpp/bindings/strong_binding.h',
+        'src/mojo/public/cpp/bindings/type_converter.h',
+        'src/mojo/public/cpp/bindings/lib/array_internal.h',
+        'src/mojo/public/cpp/bindings/lib/array_internal.cc',
+        'src/mojo/public/cpp/bindings/lib/array_serialization.h',
+        'src/mojo/public/cpp/bindings/lib/bindings_internal.h',
+        'src/mojo/public/cpp/bindings/lib/bindings_serialization.cc',
+        'src/mojo/public/cpp/bindings/lib/bindings_serialization.h',
+        'src/mojo/public/cpp/bindings/lib/bounds_checker.cc',
+        'src/mojo/public/cpp/bindings/lib/bounds_checker.h',
+        'src/mojo/public/cpp/bindings/lib/buffer.h',
+        'src/mojo/public/cpp/bindings/lib/callback_internal.h',
+        'src/mojo/public/cpp/bindings/lib/connector.cc',
+        'src/mojo/public/cpp/bindings/lib/connector.h',
+        'src/mojo/public/cpp/bindings/lib/filter_chain.cc',
+        'src/mojo/public/cpp/bindings/lib/filter_chain.h',
+        'src/mojo/public/cpp/bindings/lib/fixed_buffer.cc',
+        'src/mojo/public/cpp/bindings/lib/fixed_buffer.h',
+        'src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h',
+        'src/mojo/public/cpp/bindings/lib/map_data_internal.h',
+        'src/mojo/public/cpp/bindings/lib/map_internal.h',
+        'src/mojo/public/cpp/bindings/lib/map_serialization.h',
+        'src/mojo/public/cpp/bindings/lib/message.cc',
+        'src/mojo/public/cpp/bindings/lib/message_builder.cc',
+        'src/mojo/public/cpp/bindings/lib/message_builder.h',
+        'src/mojo/public/cpp/bindings/lib/message_filter.cc',
+        'src/mojo/public/cpp/bindings/lib/message_header_validator.cc',
+        'src/mojo/public/cpp/bindings/lib/message_header_validator.h',
+        'src/mojo/public/cpp/bindings/lib/message_internal.h',
+        'src/mojo/public/cpp/bindings/lib/message_queue.cc',
+        'src/mojo/public/cpp/bindings/lib/message_queue.h',
+        'src/mojo/public/cpp/bindings/lib/no_interface.cc',
+        'src/mojo/public/cpp/bindings/lib/router.cc',
+        'src/mojo/public/cpp/bindings/lib/router.h',
+        'src/mojo/public/cpp/bindings/lib/shared_data.h',
+        'src/mojo/public/cpp/bindings/lib/shared_ptr.h',
+        'src/mojo/public/cpp/bindings/lib/string_serialization.h',
+        'src/mojo/public/cpp/bindings/lib/string_serialization.cc',
+        'src/mojo/public/cpp/bindings/lib/validate_params.h',
+        'src/mojo/public/cpp/bindings/lib/validation_errors.cc',
+        'src/mojo/public/cpp/bindings/lib/validation_errors.h',
+      ],
+    },
+    {
+      # GN version: //mojo/public/js
+      'target_name': 'mojo_js_bindings',
+      'type': 'static_library',
+      'include_dirs': [
+        '../..'
+      ],
+      'sources': [
+        'src/mojo/public/js/constants.cc',
+        'src/mojo/public/js/constants.h',
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/environment:standalone
+      'target_name': 'mojo_environment_standalone',
+      'type': 'static_library',
+      'sources': [
+        'src/mojo/public/c/environment/async_waiter.h',
+        'src/mojo/public/c/environment/logger.h',
+        'src/mojo/public/cpp/environment/async_waiter.h',
+        'src/mojo/public/cpp/environment/environment.h',
+        'src/mojo/public/cpp/environment/lib/async_waiter.cc',
+        'src/mojo/public/cpp/environment/lib/default_async_waiter.cc',
+        'src/mojo/public/cpp/environment/lib/default_async_waiter.h',
+        'src/mojo/public/cpp/environment/lib/default_logger.cc',
+        'src/mojo/public/cpp/environment/lib/default_logger.h',
+        'src/mojo/public/cpp/environment/lib/environment.cc',
+        'src/mojo/public/cpp/environment/lib/logging.cc',
+        'src/mojo/public/cpp/environment/logging.h',
+      ],
+      'include_dirs': [
+        '../..',
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/utility
+      'target_name': 'mojo_utility',
+      'type': 'static_library',
+      'sources': [
+        'src/mojo/public/cpp/utility/mutex.h',
+        'src/mojo/public/cpp/utility/run_loop.h',
+        'src/mojo/public/cpp/utility/run_loop_handler.h',
+        'src/mojo/public/cpp/utility/thread.h',
+        'src/mojo/public/cpp/utility/lib/mutex.cc',
+        'src/mojo/public/cpp/utility/lib/run_loop.cc',
+        'src/mojo/public/cpp/utility/lib/thread.cc',
+        'src/mojo/public/cpp/utility/lib/thread_local.h',
+        'src/mojo/public/cpp/utility/lib/thread_local_posix.cc',
+        'src/mojo/public/cpp/utility/lib/thread_local_win.cc',
+      ],
+      'conditions': [
+        # See crbug.com/342893:
+        ['OS=="win"', {
+          'sources!': [
+            'src/mojo/public/cpp/utility/mutex.h',
+            'src/mojo/public/cpp/utility/thread.h',
+            'src/mojo/public/cpp/utility/lib/mutex.cc',
+            'src/mojo/public/cpp/utility/lib/thread.cc',
+          ],
+        }],
+      ],
+      'include_dirs': [
+        '../..',
+      ],
+    },
+    {
+      'target_name': 'mojo_application_bindings_mojom',
+      'type': 'none',
+      'variables': {
+        'mojom_files': [
+          'src/mojo/public/interfaces/application/application.mojom',
+          'src/mojo/public/interfaces/application/service_provider.mojom',
+          'src/mojo/public/interfaces/application/shell.mojom',
+        ],
+      },
+      'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
+    },
+    {
+      # GN version: //mojo/public/interfaces/application:application
+      'target_name': 'mojo_application_bindings',
+      'type': 'static_library',
+      'dependencies': [
+        'mojo_application_bindings_mojom',
+        'mojo_cpp_bindings',
+      ],
+      'export_dependent_settings': [
+        'mojo_cpp_bindings',
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/application
+      'target_name': 'mojo_application_base',
+      'type': 'static_library',
+      'sources': [
+        'src/mojo/public/cpp/application/application_connection.h',
+        'src/mojo/public/cpp/application/application_delegate.h',
+        'src/mojo/public/cpp/application/application_impl.h',
+        'src/mojo/public/cpp/application/connect.h',
+        'src/mojo/public/cpp/application/interface_factory.h',
+        'src/mojo/public/cpp/application/interface_factory_impl.h',
+        'src/mojo/public/cpp/application/lib/application_connection.cc',
+        'src/mojo/public/cpp/application/lib/application_delegate.cc',
+        'src/mojo/public/cpp/application/lib/application_impl.cc',
+        'src/mojo/public/cpp/application/lib/service_provider_impl.cc',
+        'src/mojo/public/cpp/application/lib/service_connector.cc',
+        'src/mojo/public/cpp/application/lib/service_connector.h',
+        'src/mojo/public/cpp/application/lib/service_registry.cc',
+        'src/mojo/public/cpp/application/lib/service_registry.h',
+        'src/mojo/public/cpp/application/lib/weak_service_provider.cc',
+        'src/mojo/public/cpp/application/lib/weak_service_provider.h',
+        'src/mojo/public/cpp/application/service_provider_impl.h',
+      ],
+      'dependencies': [
+        'mojo_application_bindings',
+      ],
+      'export_dependent_settings': [
+        'mojo_application_bindings',
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/application:standalone"
+      'target_name': 'mojo_application_standalone',
+      'type': 'static_library',
+      'sources': [
+        'src/mojo/public/cpp/application/lib/application_runner.cc',
+        'src/mojo/public/cpp/application/application_runner.h',
+      ],
+      'dependencies': [
+        'mojo_application_base',
+        'mojo_environment_standalone',
+      ],
+      'export_dependent_settings': [
+        'mojo_application_base',
+      ],
+    },
+    {
+      # GN version: //mojo/public/c/test_support
+      'target_name': 'mojo_test_support',
+      'defines': [
+        'MOJO_TEST_SUPPORT_IMPLEMENTATION',
+      ],
+      'include_dirs': [
+        '../..',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../..',
+        ],
+      },
+      'sources': [
+        'src/mojo/public/c/test_support/test_support.h',
+        'src/mojo/public/c/test_support/test_support_export.h',
+        # TODO(vtl): Convert this to thunks http://crbug.com/386799
+        'src/mojo/public/tests/test_support_private.cc',
+        'src/mojo/public/tests/test_support_private.h',
+      ],
+      'conditions': [
+        ['OS=="ios"', {
+          'type': 'static_library',
+        }, {
+          'type': 'shared_library',
+        }],
+        ['OS=="mac"', {
+          'xcode_settings': {
+            # Make it a run-path dependent library.
+            'DYLIB_INSTALL_NAME_BASE': '@loader_path',
+          },
+        }],
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/test_support:test_utils
+      'target_name': 'mojo_public_test_utils',
+      'type': 'static_library',
+      'dependencies': [
+        '../../base/base.gyp:base',
+        '../../testing/gtest.gyp:gtest',
+        'mojo_test_support',
+      ],
+      'sources': [
+        'src/mojo/public/cpp/test_support/lib/test_support.cc',
+        'src/mojo/public/cpp/test_support/lib/test_utils.cc',
+        'src/mojo/public/cpp/test_support/test_utils.h',
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/bindings/tests:mojo_public_bindings_test_utils
+      'target_name': 'mojo_public_bindings_test_utils',
+      'type': 'static_library',
+      'dependencies': [
+        '../../base/base.gyp:base',
+      ],
+      'sources': [
+        'src/mojo/public/cpp/bindings/tests/validation_test_input_parser.cc',
+        'src/mojo/public/cpp/bindings/tests/validation_test_input_parser.h',
+      ],
+    },
+    {
+      'target_name': 'mojo_public_test_interfaces_mojom',
+      'type': 'none',
+      'variables': {
+        'mojom_files': [
+          'src/mojo/public/interfaces/bindings/tests/math_calculator.mojom',
+          'src/mojo/public/interfaces/bindings/tests/no_module.mojom',
+          'src/mojo/public/interfaces/bindings/tests/rect.mojom',
+          'src/mojo/public/interfaces/bindings/tests/regression_tests.mojom',
+          'src/mojo/public/interfaces/bindings/tests/regression_tests_import.mojom',
+          'src/mojo/public/interfaces/bindings/tests/sample_factory.mojom',
+          'src/mojo/public/interfaces/bindings/tests/sample_import.mojom',
+          'src/mojo/public/interfaces/bindings/tests/sample_import2.mojom',
+          'src/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom',
+          'src/mojo/public/interfaces/bindings/tests/sample_service.mojom',
+          'src/mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom',
+          'src/mojo/public/interfaces/bindings/tests/test_structs.mojom',
+          'src/mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom',
+        ],
+      },
+      'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
+    },
+    {
+      # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces
+      'target_name': 'mojo_public_test_interfaces',
+      'type': 'static_library',
+      'export_dependent_settings': [
+        'mojo_cpp_bindings',
+      ],
+      'dependencies': [
+        'mojo_public_test_interfaces_mojom',
+        'mojo_cpp_bindings',
+      ],
+    },
+  ],
+  'conditions': [
+    ['OS == "android"', {
+      'targets': [
+        {
+          # GN version: //mojo/public/java_system
+          'target_name': 'mojo_public_java',
+          'type': 'none',
+          'variables': {
+            'java_in_dir': 'src/mojo/public/java/system',
+          },
+          'includes': [ '../../build/java.gypi' ],
+        },
+        {
+        # GN version: //mojo/public/java_bindings
+          'target_name': 'mojo_bindings_java',
+          'type': 'none',
+          'variables': {
+            'java_in_dir': 'src/mojo/public/java/bindings',
+           },
+           'dependencies': [
+             'mojo_public_java',
+           ],
+           'includes': [ '../../build/java.gypi' ],
+        },
+      ],
+    }],
+  ],
+}
diff --git a/mojo/mojo_variables.gypi b/third_party/mojo/mojo_variables.gypi
index 6ec89a0..0e082f3 100644
--- a/mojo/mojo_variables.gypi
+++ b/third_party/mojo/mojo_variables.gypi
@@ -32,21 +32,21 @@
       # which Mojo system library they are using.
       #
       ['component=="shared_library"', {
-        'mojo_system_for_component': "<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl",
-        'mojo_system_for_loadable_module': "<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl",
         'mojo_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_gles2_impl",
+        'mojo_system_for_component': "<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl",
+        'mojo_system_for_loadable_module': "<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl",
       }, {
-        'mojo_system_for_component': "<(DEPTH)/mojo/mojo_public.gyp:mojo_system_placeholder",
-        'mojo_system_for_loadable_module': "<(DEPTH)/mojo/mojo_public.gyp:mojo_system",
         'mojo_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_none",
+        'mojo_system_for_component': "<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_system_placeholder",
+        'mojo_system_for_loadable_module': "<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_system",
       }],
     ],
     'mojo_public_system_unittest_sources': [
-      '<(DEPTH)/mojo/public/c/system/tests/core_unittest.cc',
-      '<(DEPTH)/mojo/public/c/system/tests/core_unittest_pure_c.c',
-      '<(DEPTH)/mojo/public/c/system/tests/macros_unittest.cc',
-      '<(DEPTH)/mojo/public/cpp/system/tests/core_unittest.cc',
-      '<(DEPTH)/mojo/public/cpp/system/tests/macros_unittest.cc',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/c/system/tests/core_unittest.cc',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/c/system/tests/core_unittest_pure_c.c',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/c/system/tests/macros_unittest.cc',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest.cc',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc',
     ],
   },
 }
diff --git a/mojo/mojom_bindings_generator.gypi b/third_party/mojo/mojom_bindings_generator.gypi
index 4064df6..e58aab3 100644
--- a/mojo/mojom_bindings_generator.gypi
+++ b/third_party/mojo/mojom_bindings_generator.gypi
@@ -15,7 +15,8 @@
             '<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))',
         'java_out_dir': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
         'mojom_import_args%': [
-         '-I<(DEPTH)'
+         '-I<(DEPTH)',
+         '-I<(DEPTH)/third_party/mojo/src'
         ],
       },
       'inputs': [
@@ -43,12 +44,16 @@
   ],
   'include_dirs': [
     '<(DEPTH)',
+    '<(DEPTH)/third_party/mojo/src',
     '<(SHARED_INTERMEDIATE_DIR)',
+    '<(SHARED_INTERMEDIATE_DIR)/third_party/mojo/src',
   ],
   'direct_dependent_settings': {
     'include_dirs': [
       '<(DEPTH)',
+      '<(DEPTH)/third_party/mojo/src',
       '<(SHARED_INTERMEDIATE_DIR)',
+      '<(SHARED_INTERMEDIATE_DIR)/third_party/mojo/src',
     ],
     'variables': {
       'generated_src_dirs': [
diff --git a/mojo/mojom_bindings_generator_explicit.gypi b/third_party/mojo/mojom_bindings_generator_explicit.gypi
index 0b836db..d03eb85 100644
--- a/mojo/mojom_bindings_generator_explicit.gypi
+++ b/third_party/mojo/mojom_bindings_generator_explicit.gypi
@@ -10,7 +10,7 @@
     'mojom_base_output_dir':
         '<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))',
     'mojom_generated_outputs': [
-      '<!@(python <(DEPTH)/mojo/public/tools/bindings/mojom_list_outputs.py --basedir <(mojom_base_output_dir) <@(mojom_files))',
+      '<!@(python <(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/mojom_list_outputs.py --basedir <(mojom_base_output_dir) <@(mojom_files))',
     ],
   },
   # Given mojom files as inputs, generate sources.  These sources will be
@@ -23,7 +23,8 @@
       'variables': {
         'java_out_dir': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
         'mojom_import_args%': [
-         '-I<(DEPTH)'
+         '-I<(DEPTH)',
+         '-I<(DEPTH)/third_party/mojo/src'
         ],
       },
       'inputs': [
@@ -58,7 +59,9 @@
     # Include paths needed to compile the generated sources into a library.
     'include_dirs': [
       '<(DEPTH)',
+      '<(DEPTH)/third_party/mojo/src',
       '<(SHARED_INTERMEDIATE_DIR)',
+      '<(SHARED_INTERMEDIATE_DIR)/third_party/mojo/src',
     ],
     # Make sure the generated header files are available for any static library
     # that depends on a static library that depends on this generator.
@@ -68,7 +71,9 @@
       # transitive dependancies when using the library.
       'include_dirs': [
         '<(DEPTH)',
+        '<(DEPTH)/third_party/mojo/src',
         '<(SHARED_INTERMEDIATE_DIR)',
+        '<(SHARED_INTERMEDIATE_DIR)/third_party/mojo/src',
       ],
       'variables': {
         'generated_src_dirs': [
diff --git a/third_party/mojo/mojom_bindings_generator_variables.gypi b/third_party/mojo/mojom_bindings_generator_variables.gypi
new file mode 100644
index 0000000..727eef0
--- /dev/null
+++ b/third_party/mojo/mojom_bindings_generator_variables.gypi
@@ -0,0 +1,66 @@
+# Copyright 2014 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': {
+    'mojom_bindings_generator':
+        '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/mojom_bindings_generator.py',
+    'mojom_bindings_generator_sources': [
+      '<(mojom_bindings_generator)',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/enum_declaration.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_declaration.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_request_validator_declaration.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_response_validator_declaration.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/params_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_declaration.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_macros.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_declaration.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/constant_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/constants.java.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/enum_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/enum.java.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/header.java.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface.java.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface_internal.java.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/struct_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/struct.java.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/enum_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/module_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/module.amd.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/module.sky.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/python_templates/module_macros.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/python_templates/module.py.tmpl',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_cpp_generator.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_js_generator.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_python_generator.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/__init__.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/error.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/__init__.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/data.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/generator.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/module.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/pack.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/__init__.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/ast.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/lexer.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/parser.py',
+      '<(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/translate.py',
+    ]
+  }
+}
diff --git a/mojo/edk/DEPS b/third_party/mojo/src/mojo/edk/DEPS
index 9a51b60..9a51b60 100644
--- a/mojo/edk/DEPS
+++ b/third_party/mojo/src/mojo/edk/DEPS
diff --git a/mojo/edk/embedder/BUILD.gn b/third_party/mojo/src/mojo/edk/embedder/BUILD.gn
index d9a6e69..d9a6e69 100644
--- a/mojo/edk/embedder/BUILD.gn
+++ b/third_party/mojo/src/mojo/edk/embedder/BUILD.gn
diff --git a/mojo/edk/embedder/DEPS b/third_party/mojo/src/mojo/edk/embedder/DEPS
index c3a0d22..c3a0d22 100644
--- a/mojo/edk/embedder/DEPS
+++ b/third_party/mojo/src/mojo/edk/embedder/DEPS
diff --git a/mojo/edk/embedder/README.md b/third_party/mojo/src/mojo/edk/embedder/README.md
index f976fcb..f976fcb 100644
--- a/mojo/edk/embedder/README.md
+++ b/third_party/mojo/src/mojo/edk/embedder/README.md
diff --git a/mojo/edk/embedder/channel_info_forward.h b/third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h
index 8d23836..8d23836 100644
--- a/mojo/edk/embedder/channel_info_forward.h
+++ b/third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h
diff --git a/mojo/edk/embedder/channel_init.cc b/third_party/mojo/src/mojo/edk/embedder/channel_init.cc
index 9a0bfce..9a0bfce 100644
--- a/mojo/edk/embedder/channel_init.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/channel_init.cc
diff --git a/mojo/edk/embedder/channel_init.h b/third_party/mojo/src/mojo/edk/embedder/channel_init.h
index 59b6694..59b6694 100644
--- a/mojo/edk/embedder/channel_init.h
+++ b/third_party/mojo/src/mojo/edk/embedder/channel_init.h
diff --git a/mojo/edk/embedder/configuration.h b/third_party/mojo/src/mojo/edk/embedder/configuration.h
index 0f99e1f..0f99e1f 100644
--- a/mojo/edk/embedder/configuration.h
+++ b/third_party/mojo/src/mojo/edk/embedder/configuration.h
diff --git a/mojo/edk/embedder/embedder.cc b/third_party/mojo/src/mojo/edk/embedder/embedder.cc
index 1d12c1e..1d12c1e 100644
--- a/mojo/edk/embedder/embedder.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/embedder.cc
diff --git a/mojo/edk/embedder/embedder.h b/third_party/mojo/src/mojo/edk/embedder/embedder.h
index 987c6879..987c6879 100644
--- a/mojo/edk/embedder/embedder.h
+++ b/third_party/mojo/src/mojo/edk/embedder/embedder.h
diff --git a/mojo/edk/embedder/embedder_internal.h b/third_party/mojo/src/mojo/edk/embedder/embedder_internal.h
index ab8388a..ab8388a 100644
--- a/mojo/edk/embedder/embedder_internal.h
+++ b/third_party/mojo/src/mojo/edk/embedder/embedder_internal.h
diff --git a/mojo/edk/embedder/embedder_unittest.cc b/third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc
index ed4ea2e..ed4ea2e 100644
--- a/mojo/edk/embedder/embedder_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc
diff --git a/mojo/edk/embedder/entrypoints.cc b/third_party/mojo/src/mojo/edk/embedder/entrypoints.cc
index 9338cc7..9338cc7 100644
--- a/mojo/edk/embedder/entrypoints.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/entrypoints.cc
diff --git a/mojo/edk/embedder/platform_channel_pair.cc b/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.cc
index 4e88bc9..4e88bc9 100644
--- a/mojo/edk/embedder/platform_channel_pair.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.cc
diff --git a/mojo/edk/embedder/platform_channel_pair.h b/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h
index d77c100..d77c100 100644
--- a/mojo/edk/embedder/platform_channel_pair.h
+++ b/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h
diff --git a/mojo/edk/embedder/platform_channel_pair_posix.cc b/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair_posix.cc
index 2242cce..2242cce 100644
--- a/mojo/edk/embedder/platform_channel_pair_posix.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair_posix.cc
diff --git a/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc b/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc
index 56540d7..56540d7 100644
--- a/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc
diff --git a/mojo/edk/embedder/platform_channel_pair_win.cc b/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair_win.cc
index 25306a6..25306a6 100644
--- a/mojo/edk/embedder/platform_channel_pair_win.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair_win.cc
diff --git a/mojo/edk/embedder/platform_channel_utils_posix.cc b/third_party/mojo/src/mojo/edk/embedder/platform_channel_utils_posix.cc
index 61b573b..61b573b 100644
--- a/mojo/edk/embedder/platform_channel_utils_posix.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/platform_channel_utils_posix.cc
diff --git a/mojo/edk/embedder/platform_channel_utils_posix.h b/third_party/mojo/src/mojo/edk/embedder/platform_channel_utils_posix.h
index 34efcad..34efcad 100644
--- a/mojo/edk/embedder/platform_channel_utils_posix.h
+++ b/third_party/mojo/src/mojo/edk/embedder/platform_channel_utils_posix.h
diff --git a/mojo/edk/embedder/platform_handle.cc b/third_party/mojo/src/mojo/edk/embedder/platform_handle.cc
index 4675714..4675714 100644
--- a/mojo/edk/embedder/platform_handle.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/platform_handle.cc
diff --git a/mojo/edk/embedder/platform_handle.h b/third_party/mojo/src/mojo/edk/embedder/platform_handle.h
index 346301a..346301a 100644
--- a/mojo/edk/embedder/platform_handle.h
+++ b/third_party/mojo/src/mojo/edk/embedder/platform_handle.h
diff --git a/mojo/edk/embedder/platform_handle_utils.h b/third_party/mojo/src/mojo/edk/embedder/platform_handle_utils.h
index b3d7a79..b3d7a79 100644
--- a/mojo/edk/embedder/platform_handle_utils.h
+++ b/third_party/mojo/src/mojo/edk/embedder/platform_handle_utils.h
diff --git a/mojo/edk/embedder/platform_handle_utils_posix.cc b/third_party/mojo/src/mojo/edk/embedder/platform_handle_utils_posix.cc
index b3be93f..b3be93f 100644
--- a/mojo/edk/embedder/platform_handle_utils_posix.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/platform_handle_utils_posix.cc
diff --git a/mojo/edk/embedder/platform_handle_utils_win.cc b/third_party/mojo/src/mojo/edk/embedder/platform_handle_utils_win.cc
index 43d1331..43d1331 100644
--- a/mojo/edk/embedder/platform_handle_utils_win.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/platform_handle_utils_win.cc
diff --git a/mojo/edk/embedder/platform_handle_vector.h b/third_party/mojo/src/mojo/edk/embedder/platform_handle_vector.h
index 96356b7..96356b7 100644
--- a/mojo/edk/embedder/platform_handle_vector.h
+++ b/third_party/mojo/src/mojo/edk/embedder/platform_handle_vector.h
diff --git a/mojo/edk/embedder/platform_shared_buffer.h b/third_party/mojo/src/mojo/edk/embedder/platform_shared_buffer.h
index 07f8b90..07f8b90 100644
--- a/mojo/edk/embedder/platform_shared_buffer.h
+++ b/third_party/mojo/src/mojo/edk/embedder/platform_shared_buffer.h
diff --git a/mojo/edk/embedder/platform_support.h b/third_party/mojo/src/mojo/edk/embedder/platform_support.h
index 4556ee3..4556ee3 100644
--- a/mojo/edk/embedder/platform_support.h
+++ b/third_party/mojo/src/mojo/edk/embedder/platform_support.h
diff --git a/mojo/edk/embedder/scoped_platform_handle.h b/third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h
index 2919b04..2919b04 100644
--- a/mojo/edk/embedder/scoped_platform_handle.h
+++ b/third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h
diff --git a/mojo/edk/embedder/simple_platform_shared_buffer.cc b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer.cc
index 866250c..866250c 100644
--- a/mojo/edk/embedder/simple_platform_shared_buffer.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer.cc
diff --git a/mojo/edk/embedder/simple_platform_shared_buffer.h b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer.h
index b4958b9..b4958b9 100644
--- a/mojo/edk/embedder/simple_platform_shared_buffer.h
+++ b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer.h
diff --git a/mojo/edk/embedder/simple_platform_shared_buffer_android.cc b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_android.cc
index 3517db3..3517db3 100644
--- a/mojo/edk/embedder/simple_platform_shared_buffer_android.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_android.cc
diff --git a/mojo/edk/embedder/simple_platform_shared_buffer_posix.cc b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_posix.cc
index a3d10ef..a3d10ef 100644
--- a/mojo/edk/embedder/simple_platform_shared_buffer_posix.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_posix.cc
diff --git a/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc
index 4644b7b..4644b7b 100644
--- a/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc
diff --git a/mojo/edk/embedder/simple_platform_shared_buffer_win.cc b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_win.cc
index 0737465..0737465 100644
--- a/mojo/edk/embedder/simple_platform_shared_buffer_win.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_win.cc
diff --git a/mojo/edk/embedder/simple_platform_support.cc b/third_party/mojo/src/mojo/edk/embedder/simple_platform_support.cc
index c59cfb3..c59cfb3 100644
--- a/mojo/edk/embedder/simple_platform_support.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/simple_platform_support.cc
diff --git a/mojo/edk/embedder/simple_platform_support.h b/third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h
index 2013f8d..2013f8d 100644
--- a/mojo/edk/embedder/simple_platform_support.h
+++ b/third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h
diff --git a/mojo/edk/embedder/test_embedder.cc b/third_party/mojo/src/mojo/edk/embedder/test_embedder.cc
index defab41..defab41 100644
--- a/mojo/edk/embedder/test_embedder.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/test_embedder.cc
diff --git a/mojo/edk/embedder/test_embedder.h b/third_party/mojo/src/mojo/edk/embedder/test_embedder.h
index 76917ee..76917ee 100644
--- a/mojo/edk/embedder/test_embedder.h
+++ b/third_party/mojo/src/mojo/edk/embedder/test_embedder.h
diff --git a/mojo/edk/js/BUILD.gn b/third_party/mojo/src/mojo/edk/js/BUILD.gn
index 9a066d3..9a066d3 100644
--- a/mojo/edk/js/BUILD.gn
+++ b/third_party/mojo/src/mojo/edk/js/BUILD.gn
diff --git a/mojo/edk/js/DEPS b/third_party/mojo/src/mojo/edk/js/DEPS
index c350edf..c350edf 100644
--- a/mojo/edk/js/DEPS
+++ b/third_party/mojo/src/mojo/edk/js/DEPS
diff --git a/mojo/edk/js/core.cc b/third_party/mojo/src/mojo/edk/js/core.cc
index c06977d..c06977d 100644
--- a/mojo/edk/js/core.cc
+++ b/third_party/mojo/src/mojo/edk/js/core.cc
diff --git a/mojo/edk/js/core.h b/third_party/mojo/src/mojo/edk/js/core.h
index 445fb00..445fb00 100644
--- a/mojo/edk/js/core.h
+++ b/third_party/mojo/src/mojo/edk/js/core.h
diff --git a/mojo/edk/js/drain_data.cc b/third_party/mojo/src/mojo/edk/js/drain_data.cc
index 0667c64..0667c64 100644
--- a/mojo/edk/js/drain_data.cc
+++ b/third_party/mojo/src/mojo/edk/js/drain_data.cc
diff --git a/mojo/edk/js/drain_data.h b/third_party/mojo/src/mojo/edk/js/drain_data.h
index 48f1de2..48f1de2 100644
--- a/mojo/edk/js/drain_data.h
+++ b/third_party/mojo/src/mojo/edk/js/drain_data.h
diff --git a/mojo/edk/js/handle.cc b/third_party/mojo/src/mojo/edk/js/handle.cc
index de8f338..de8f338 100644
--- a/mojo/edk/js/handle.cc
+++ b/third_party/mojo/src/mojo/edk/js/handle.cc
diff --git a/mojo/edk/js/handle.h b/third_party/mojo/src/mojo/edk/js/handle.h
index 200b322..200b322 100644
--- a/mojo/edk/js/handle.h
+++ b/third_party/mojo/src/mojo/edk/js/handle.h
diff --git a/mojo/edk/js/handle_close_observer.h b/third_party/mojo/src/mojo/edk/js/handle_close_observer.h
index 3e537fd..3e537fd 100644
--- a/mojo/edk/js/handle_close_observer.h
+++ b/third_party/mojo/src/mojo/edk/js/handle_close_observer.h
diff --git a/mojo/edk/js/handle_unittest.cc b/third_party/mojo/src/mojo/edk/js/handle_unittest.cc
index 53f474e..53f474e 100644
--- a/mojo/edk/js/handle_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/js/handle_unittest.cc
diff --git a/mojo/edk/js/mojo_runner_delegate.cc b/third_party/mojo/src/mojo/edk/js/mojo_runner_delegate.cc
index 152b12c..152b12c 100644
--- a/mojo/edk/js/mojo_runner_delegate.cc
+++ b/third_party/mojo/src/mojo/edk/js/mojo_runner_delegate.cc
diff --git a/mojo/edk/js/mojo_runner_delegate.h b/third_party/mojo/src/mojo/edk/js/mojo_runner_delegate.h
index 423eefb..423eefb 100644
--- a/mojo/edk/js/mojo_runner_delegate.h
+++ b/third_party/mojo/src/mojo/edk/js/mojo_runner_delegate.h
diff --git a/mojo/edk/js/support.cc b/third_party/mojo/src/mojo/edk/js/support.cc
index 7d44024..7d44024 100644
--- a/mojo/edk/js/support.cc
+++ b/third_party/mojo/src/mojo/edk/js/support.cc
diff --git a/mojo/edk/js/support.h b/third_party/mojo/src/mojo/edk/js/support.h
index b49dd23..b49dd23 100644
--- a/mojo/edk/js/support.h
+++ b/third_party/mojo/src/mojo/edk/js/support.h
diff --git a/mojo/edk/js/test/BUILD.gn b/third_party/mojo/src/mojo/edk/js/test/BUILD.gn
index badc3ad..badc3ad 100644
--- a/mojo/edk/js/test/BUILD.gn
+++ b/third_party/mojo/src/mojo/edk/js/test/BUILD.gn
diff --git a/mojo/edk/js/test/hexdump.js b/third_party/mojo/src/mojo/edk/js/test/hexdump.js
index b36c47f..b36c47f 100644
--- a/mojo/edk/js/test/hexdump.js
+++ b/third_party/mojo/src/mojo/edk/js/test/hexdump.js
diff --git a/mojo/edk/js/test/run_js_integration_tests.cc b/third_party/mojo/src/mojo/edk/js/test/run_js_integration_tests.cc
index 1a6f1d6..1a6f1d6 100644
--- a/mojo/edk/js/test/run_js_integration_tests.cc
+++ b/third_party/mojo/src/mojo/edk/js/test/run_js_integration_tests.cc
diff --git a/mojo/edk/js/test/run_js_tests.cc b/third_party/mojo/src/mojo/edk/js/test/run_js_tests.cc
index b574902..b574902 100644
--- a/mojo/edk/js/test/run_js_tests.cc
+++ b/third_party/mojo/src/mojo/edk/js/test/run_js_tests.cc
diff --git a/mojo/edk/js/tests/BUILD.gn b/third_party/mojo/src/mojo/edk/js/tests/BUILD.gn
index c9711c7..c9711c7 100644
--- a/mojo/edk/js/tests/BUILD.gn
+++ b/third_party/mojo/src/mojo/edk/js/tests/BUILD.gn
diff --git a/mojo/edk/js/tests/connection_tests.js b/third_party/mojo/src/mojo/edk/js/tests/connection_tests.js
index 17009d9..17009d9 100644
--- a/mojo/edk/js/tests/connection_tests.js
+++ b/third_party/mojo/src/mojo/edk/js/tests/connection_tests.js
diff --git a/mojo/edk/js/tests/js_to_cpp.mojom b/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp.mojom
index 69f67b6..69f67b6 100644
--- a/mojo/edk/js/tests/js_to_cpp.mojom
+++ b/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp.mojom
diff --git a/mojo/edk/js/tests/js_to_cpp_tests.cc b/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc
index 1da70c2..1da70c2 100644
--- a/mojo/edk/js/tests/js_to_cpp_tests.cc
+++ b/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc
diff --git a/mojo/edk/js/tests/js_to_cpp_tests.js b/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.js
index 140ad4c..140ad4c 100644
--- a/mojo/edk/js/tests/js_to_cpp_tests.js
+++ b/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.js
diff --git a/mojo/edk/js/tests/sample_service_tests.js b/third_party/mojo/src/mojo/edk/js/tests/sample_service_tests.js
index 2afdf3e..2afdf3e 100644
--- a/mojo/edk/js/tests/sample_service_tests.js
+++ b/third_party/mojo/src/mojo/edk/js/tests/sample_service_tests.js
diff --git a/mojo/edk/js/threading.cc b/third_party/mojo/src/mojo/edk/js/threading.cc
index b571e3e..b571e3e 100644
--- a/mojo/edk/js/threading.cc
+++ b/third_party/mojo/src/mojo/edk/js/threading.cc
diff --git a/mojo/edk/js/threading.h b/third_party/mojo/src/mojo/edk/js/threading.h
index 7cf0d53..7cf0d53 100644
--- a/mojo/edk/js/threading.h
+++ b/third_party/mojo/src/mojo/edk/js/threading.h
diff --git a/mojo/edk/js/waiting_callback.cc b/third_party/mojo/src/mojo/edk/js/waiting_callback.cc
index d5c48c5..d5c48c5 100644
--- a/mojo/edk/js/waiting_callback.cc
+++ b/third_party/mojo/src/mojo/edk/js/waiting_callback.cc
diff --git a/mojo/edk/js/waiting_callback.h b/third_party/mojo/src/mojo/edk/js/waiting_callback.h
index 5a9dfaf..5a9dfaf 100644
--- a/mojo/edk/js/waiting_callback.h
+++ b/third_party/mojo/src/mojo/edk/js/waiting_callback.h
diff --git a/mojo/edk/mojo_edk.gni b/third_party/mojo/src/mojo/edk/mojo_edk.gni
index 1d1d992..1d1d992 100644
--- a/mojo/edk/mojo_edk.gni
+++ b/third_party/mojo/src/mojo/edk/mojo_edk.gni
diff --git a/mojo/edk/system/BUILD.gn b/third_party/mojo/src/mojo/edk/system/BUILD.gn
index 2f8abdd..2f8abdd 100644
--- a/mojo/edk/system/BUILD.gn
+++ b/third_party/mojo/src/mojo/edk/system/BUILD.gn
diff --git a/mojo/edk/system/DEPS b/third_party/mojo/src/mojo/edk/system/DEPS
index 4ef4138..4ef4138 100644
--- a/mojo/edk/system/DEPS
+++ b/third_party/mojo/src/mojo/edk/system/DEPS
diff --git a/mojo/edk/system/async_waiter.cc b/third_party/mojo/src/mojo/edk/system/async_waiter.cc
index 071eb01..071eb01 100644
--- a/mojo/edk/system/async_waiter.cc
+++ b/third_party/mojo/src/mojo/edk/system/async_waiter.cc
diff --git a/mojo/edk/system/async_waiter.h b/third_party/mojo/src/mojo/edk/system/async_waiter.h
index da412c0..da412c0 100644
--- a/mojo/edk/system/async_waiter.h
+++ b/third_party/mojo/src/mojo/edk/system/async_waiter.h
diff --git a/mojo/edk/system/awakable.h b/third_party/mojo/src/mojo/edk/system/awakable.h
index 057d3eb..057d3eb 100644
--- a/mojo/edk/system/awakable.h
+++ b/third_party/mojo/src/mojo/edk/system/awakable.h
diff --git a/mojo/edk/system/awakable_list.cc b/third_party/mojo/src/mojo/edk/system/awakable_list.cc
index e74e2c0..e74e2c0 100644
--- a/mojo/edk/system/awakable_list.cc
+++ b/third_party/mojo/src/mojo/edk/system/awakable_list.cc
diff --git a/mojo/edk/system/awakable_list.h b/third_party/mojo/src/mojo/edk/system/awakable_list.h
index 19c03c8..19c03c8 100644
--- a/mojo/edk/system/awakable_list.h
+++ b/third_party/mojo/src/mojo/edk/system/awakable_list.h
diff --git a/mojo/edk/system/awakable_list_unittest.cc b/third_party/mojo/src/mojo/edk/system/awakable_list_unittest.cc
index 0ef6a7a..0ef6a7a 100644
--- a/mojo/edk/system/awakable_list_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/awakable_list_unittest.cc
diff --git a/mojo/edk/system/channel.cc b/third_party/mojo/src/mojo/edk/system/channel.cc
index 71d7208..71d7208 100644
--- a/mojo/edk/system/channel.cc
+++ b/third_party/mojo/src/mojo/edk/system/channel.cc
diff --git a/mojo/edk/system/channel.h b/third_party/mojo/src/mojo/edk/system/channel.h
index 3961859..3961859 100644
--- a/mojo/edk/system/channel.h
+++ b/third_party/mojo/src/mojo/edk/system/channel.h
diff --git a/mojo/edk/system/channel_endpoint.cc b/third_party/mojo/src/mojo/edk/system/channel_endpoint.cc
index 8ef1f40..8ef1f40 100644
--- a/mojo/edk/system/channel_endpoint.cc
+++ b/third_party/mojo/src/mojo/edk/system/channel_endpoint.cc
diff --git a/mojo/edk/system/channel_endpoint.h b/third_party/mojo/src/mojo/edk/system/channel_endpoint.h
index 90ee86b..90ee86b 100644
--- a/mojo/edk/system/channel_endpoint.h
+++ b/third_party/mojo/src/mojo/edk/system/channel_endpoint.h
diff --git a/mojo/edk/system/channel_endpoint_client.h b/third_party/mojo/src/mojo/edk/system/channel_endpoint_client.h
index c758e9c..c758e9c 100644
--- a/mojo/edk/system/channel_endpoint_client.h
+++ b/third_party/mojo/src/mojo/edk/system/channel_endpoint_client.h
diff --git a/mojo/edk/system/channel_endpoint_id.cc b/third_party/mojo/src/mojo/edk/system/channel_endpoint_id.cc
index ed00f6a..ed00f6a 100644
--- a/mojo/edk/system/channel_endpoint_id.cc
+++ b/third_party/mojo/src/mojo/edk/system/channel_endpoint_id.cc
diff --git a/mojo/edk/system/channel_endpoint_id.h b/third_party/mojo/src/mojo/edk/system/channel_endpoint_id.h
index c673258..c673258 100644
--- a/mojo/edk/system/channel_endpoint_id.h
+++ b/third_party/mojo/src/mojo/edk/system/channel_endpoint_id.h
diff --git a/mojo/edk/system/channel_endpoint_id_unittest.cc b/third_party/mojo/src/mojo/edk/system/channel_endpoint_id_unittest.cc
index a5bd14f..a5bd14f 100644
--- a/mojo/edk/system/channel_endpoint_id_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/channel_endpoint_id_unittest.cc
diff --git a/mojo/edk/system/channel_info.cc b/third_party/mojo/src/mojo/edk/system/channel_info.cc
index 6d23215..6d23215 100644
--- a/mojo/edk/system/channel_info.cc
+++ b/third_party/mojo/src/mojo/edk/system/channel_info.cc
diff --git a/mojo/edk/system/channel_info.h b/third_party/mojo/src/mojo/edk/system/channel_info.h
index 5167cca..5167cca 100644
--- a/mojo/edk/system/channel_info.h
+++ b/third_party/mojo/src/mojo/edk/system/channel_info.h
diff --git a/mojo/edk/system/channel_manager.cc b/third_party/mojo/src/mojo/edk/system/channel_manager.cc
index 4e58f89..4e58f89 100644
--- a/mojo/edk/system/channel_manager.cc
+++ b/third_party/mojo/src/mojo/edk/system/channel_manager.cc
diff --git a/mojo/edk/system/channel_manager.h b/third_party/mojo/src/mojo/edk/system/channel_manager.h
index bb6371b..bb6371b 100644
--- a/mojo/edk/system/channel_manager.h
+++ b/third_party/mojo/src/mojo/edk/system/channel_manager.h
diff --git a/mojo/edk/system/channel_manager_unittest.cc b/third_party/mojo/src/mojo/edk/system/channel_manager_unittest.cc
index 52f3f0e..52f3f0e 100644
--- a/mojo/edk/system/channel_manager_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/channel_manager_unittest.cc
diff --git a/mojo/edk/system/channel_unittest.cc b/third_party/mojo/src/mojo/edk/system/channel_unittest.cc
index e82b321..e82b321 100644
--- a/mojo/edk/system/channel_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/channel_unittest.cc
diff --git a/mojo/edk/system/configuration.cc b/third_party/mojo/src/mojo/edk/system/configuration.cc
index 4756c99..4756c99 100644
--- a/mojo/edk/system/configuration.cc
+++ b/third_party/mojo/src/mojo/edk/system/configuration.cc
diff --git a/mojo/edk/system/configuration.h b/third_party/mojo/src/mojo/edk/system/configuration.h
index 007277a..007277a 100644
--- a/mojo/edk/system/configuration.h
+++ b/third_party/mojo/src/mojo/edk/system/configuration.h
diff --git a/mojo/edk/system/core.cc b/third_party/mojo/src/mojo/edk/system/core.cc
index 6189e50..6189e50 100644
--- a/mojo/edk/system/core.cc
+++ b/third_party/mojo/src/mojo/edk/system/core.cc
diff --git a/mojo/edk/system/core.h b/third_party/mojo/src/mojo/edk/system/core.h
index 0ff9c01..0ff9c01 100644
--- a/mojo/edk/system/core.h
+++ b/third_party/mojo/src/mojo/edk/system/core.h
diff --git a/mojo/edk/system/core_test_base.cc b/third_party/mojo/src/mojo/edk/system/core_test_base.cc
index b81a051..b81a051 100644
--- a/mojo/edk/system/core_test_base.cc
+++ b/third_party/mojo/src/mojo/edk/system/core_test_base.cc
diff --git a/mojo/edk/system/core_test_base.h b/third_party/mojo/src/mojo/edk/system/core_test_base.h
index c2b5ee2..c2b5ee2 100644
--- a/mojo/edk/system/core_test_base.h
+++ b/third_party/mojo/src/mojo/edk/system/core_test_base.h
diff --git a/mojo/edk/system/core_unittest.cc b/third_party/mojo/src/mojo/edk/system/core_unittest.cc
index b789301..b789301 100644
--- a/mojo/edk/system/core_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/core_unittest.cc
diff --git a/mojo/edk/system/data_pipe.cc b/third_party/mojo/src/mojo/edk/system/data_pipe.cc
index 2f433bd..2f433bd 100644
--- a/mojo/edk/system/data_pipe.cc
+++ b/third_party/mojo/src/mojo/edk/system/data_pipe.cc
diff --git a/mojo/edk/system/data_pipe.h b/third_party/mojo/src/mojo/edk/system/data_pipe.h
index d893465..d893465 100644
--- a/mojo/edk/system/data_pipe.h
+++ b/third_party/mojo/src/mojo/edk/system/data_pipe.h
diff --git a/mojo/edk/system/data_pipe_consumer_dispatcher.cc b/third_party/mojo/src/mojo/edk/system/data_pipe_consumer_dispatcher.cc
index 21127c6..21127c6 100644
--- a/mojo/edk/system/data_pipe_consumer_dispatcher.cc
+++ b/third_party/mojo/src/mojo/edk/system/data_pipe_consumer_dispatcher.cc
diff --git a/mojo/edk/system/data_pipe_consumer_dispatcher.h b/third_party/mojo/src/mojo/edk/system/data_pipe_consumer_dispatcher.h
index 10a3d94..10a3d94 100644
--- a/mojo/edk/system/data_pipe_consumer_dispatcher.h
+++ b/third_party/mojo/src/mojo/edk/system/data_pipe_consumer_dispatcher.h
diff --git a/mojo/edk/system/data_pipe_producer_dispatcher.cc b/third_party/mojo/src/mojo/edk/system/data_pipe_producer_dispatcher.cc
index 0531126..0531126 100644
--- a/mojo/edk/system/data_pipe_producer_dispatcher.cc
+++ b/third_party/mojo/src/mojo/edk/system/data_pipe_producer_dispatcher.cc
diff --git a/mojo/edk/system/data_pipe_producer_dispatcher.h b/third_party/mojo/src/mojo/edk/system/data_pipe_producer_dispatcher.h
index 39c070c..39c070c 100644
--- a/mojo/edk/system/data_pipe_producer_dispatcher.h
+++ b/third_party/mojo/src/mojo/edk/system/data_pipe_producer_dispatcher.h
diff --git a/mojo/edk/system/data_pipe_unittest.cc b/third_party/mojo/src/mojo/edk/system/data_pipe_unittest.cc
index ad02222..ad02222 100644
--- a/mojo/edk/system/data_pipe_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/data_pipe_unittest.cc
diff --git a/mojo/edk/system/dispatcher.cc b/third_party/mojo/src/mojo/edk/system/dispatcher.cc
index e2f2b87..e2f2b87 100644
--- a/mojo/edk/system/dispatcher.cc
+++ b/third_party/mojo/src/mojo/edk/system/dispatcher.cc
diff --git a/mojo/edk/system/dispatcher.h b/third_party/mojo/src/mojo/edk/system/dispatcher.h
index c069269..c069269 100644
--- a/mojo/edk/system/dispatcher.h
+++ b/third_party/mojo/src/mojo/edk/system/dispatcher.h
diff --git a/mojo/edk/system/dispatcher_unittest.cc b/third_party/mojo/src/mojo/edk/system/dispatcher_unittest.cc
index 97e2eed..97e2eed 100644
--- a/mojo/edk/system/dispatcher_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/dispatcher_unittest.cc
diff --git a/mojo/edk/system/endpoint_relayer.cc b/third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc
index 52faefa..52faefa 100644
--- a/mojo/edk/system/endpoint_relayer.cc
+++ b/third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc
diff --git a/mojo/edk/system/endpoint_relayer.h b/third_party/mojo/src/mojo/edk/system/endpoint_relayer.h
index a0a93a4..a0a93a4 100644
--- a/mojo/edk/system/endpoint_relayer.h
+++ b/third_party/mojo/src/mojo/edk/system/endpoint_relayer.h
diff --git a/mojo/edk/system/handle_signals_state.h b/third_party/mojo/src/mojo/edk/system/handle_signals_state.h
index 3391ea0..3391ea0 100644
--- a/mojo/edk/system/handle_signals_state.h
+++ b/third_party/mojo/src/mojo/edk/system/handle_signals_state.h
diff --git a/mojo/edk/system/handle_table.cc b/third_party/mojo/src/mojo/edk/system/handle_table.cc
index e054919..e054919 100644
--- a/mojo/edk/system/handle_table.cc
+++ b/third_party/mojo/src/mojo/edk/system/handle_table.cc
diff --git a/mojo/edk/system/handle_table.h b/third_party/mojo/src/mojo/edk/system/handle_table.h
index 9385643..9385643 100644
--- a/mojo/edk/system/handle_table.h
+++ b/third_party/mojo/src/mojo/edk/system/handle_table.h
diff --git a/mojo/edk/system/incoming_endpoint.cc b/third_party/mojo/src/mojo/edk/system/incoming_endpoint.cc
index 14f1a71..14f1a71 100644
--- a/mojo/edk/system/incoming_endpoint.cc
+++ b/third_party/mojo/src/mojo/edk/system/incoming_endpoint.cc
diff --git a/mojo/edk/system/incoming_endpoint.h b/third_party/mojo/src/mojo/edk/system/incoming_endpoint.h
index 4db7d5a..4db7d5a 100644
--- a/mojo/edk/system/incoming_endpoint.h
+++ b/third_party/mojo/src/mojo/edk/system/incoming_endpoint.h
diff --git a/mojo/edk/system/local_data_pipe.cc b/third_party/mojo/src/mojo/edk/system/local_data_pipe.cc
index 8b9f673..8b9f673 100644
--- a/mojo/edk/system/local_data_pipe.cc
+++ b/third_party/mojo/src/mojo/edk/system/local_data_pipe.cc
diff --git a/mojo/edk/system/local_data_pipe.h b/third_party/mojo/src/mojo/edk/system/local_data_pipe.h
index abe3a46..abe3a46 100644
--- a/mojo/edk/system/local_data_pipe.h
+++ b/third_party/mojo/src/mojo/edk/system/local_data_pipe.h
diff --git a/mojo/edk/system/local_data_pipe_unittest.cc b/third_party/mojo/src/mojo/edk/system/local_data_pipe_unittest.cc
index 1223a2ba..1223a2ba 100644
--- a/mojo/edk/system/local_data_pipe_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/local_data_pipe_unittest.cc
diff --git a/mojo/edk/system/local_message_pipe_endpoint.cc b/third_party/mojo/src/mojo/edk/system/local_message_pipe_endpoint.cc
index 1800aa4..1800aa4 100644
--- a/mojo/edk/system/local_message_pipe_endpoint.cc
+++ b/third_party/mojo/src/mojo/edk/system/local_message_pipe_endpoint.cc
diff --git a/mojo/edk/system/local_message_pipe_endpoint.h b/third_party/mojo/src/mojo/edk/system/local_message_pipe_endpoint.h
index f792d90..f792d90 100644
--- a/mojo/edk/system/local_message_pipe_endpoint.h
+++ b/third_party/mojo/src/mojo/edk/system/local_message_pipe_endpoint.h
diff --git a/mojo/edk/system/mapping_table.cc b/third_party/mojo/src/mojo/edk/system/mapping_table.cc
index 693e8d7..693e8d7 100644
--- a/mojo/edk/system/mapping_table.cc
+++ b/third_party/mojo/src/mojo/edk/system/mapping_table.cc
diff --git a/mojo/edk/system/mapping_table.h b/third_party/mojo/src/mojo/edk/system/mapping_table.h
index d2812d8..d2812d8 100644
--- a/mojo/edk/system/mapping_table.h
+++ b/third_party/mojo/src/mojo/edk/system/mapping_table.h
diff --git a/mojo/edk/system/memory.cc b/third_party/mojo/src/mojo/edk/system/memory.cc
index 0e3d9a9..0e3d9a9 100644
--- a/mojo/edk/system/memory.cc
+++ b/third_party/mojo/src/mojo/edk/system/memory.cc
diff --git a/mojo/edk/system/memory.h b/third_party/mojo/src/mojo/edk/system/memory.h
index 96cf219..96cf219 100644
--- a/mojo/edk/system/memory.h
+++ b/third_party/mojo/src/mojo/edk/system/memory.h
diff --git a/mojo/edk/system/memory_unittest.cc b/third_party/mojo/src/mojo/edk/system/memory_unittest.cc
index 46515c0..46515c0 100644
--- a/mojo/edk/system/memory_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/memory_unittest.cc
diff --git a/mojo/edk/system/message_in_transit.cc b/third_party/mojo/src/mojo/edk/system/message_in_transit.cc
index 68919f2..68919f2 100644
--- a/mojo/edk/system/message_in_transit.cc
+++ b/third_party/mojo/src/mojo/edk/system/message_in_transit.cc
diff --git a/mojo/edk/system/message_in_transit.h b/third_party/mojo/src/mojo/edk/system/message_in_transit.h
index 023362a..023362a 100644
--- a/mojo/edk/system/message_in_transit.h
+++ b/third_party/mojo/src/mojo/edk/system/message_in_transit.h
diff --git a/mojo/edk/system/message_in_transit_queue.cc b/third_party/mojo/src/mojo/edk/system/message_in_transit_queue.cc
index ab5195e..ab5195e 100644
--- a/mojo/edk/system/message_in_transit_queue.cc
+++ b/third_party/mojo/src/mojo/edk/system/message_in_transit_queue.cc
diff --git a/mojo/edk/system/message_in_transit_queue.h b/third_party/mojo/src/mojo/edk/system/message_in_transit_queue.h
index d81bd2b..d81bd2b 100644
--- a/mojo/edk/system/message_in_transit_queue.h
+++ b/third_party/mojo/src/mojo/edk/system/message_in_transit_queue.h
diff --git a/mojo/edk/system/message_pipe.cc b/third_party/mojo/src/mojo/edk/system/message_pipe.cc
index 554401e..554401e 100644
--- a/mojo/edk/system/message_pipe.cc
+++ b/third_party/mojo/src/mojo/edk/system/message_pipe.cc
diff --git a/mojo/edk/system/message_pipe.h b/third_party/mojo/src/mojo/edk/system/message_pipe.h
index df05014..df05014 100644
--- a/mojo/edk/system/message_pipe.h
+++ b/third_party/mojo/src/mojo/edk/system/message_pipe.h
diff --git a/mojo/edk/system/message_pipe_dispatcher.cc b/third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher.cc
index a6733dbe..a6733dbe 100644
--- a/mojo/edk/system/message_pipe_dispatcher.cc
+++ b/third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher.cc
diff --git a/mojo/edk/system/message_pipe_dispatcher.h b/third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher.h
index fb16dd3..fb16dd3 100644
--- a/mojo/edk/system/message_pipe_dispatcher.h
+++ b/third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher.h
diff --git a/mojo/edk/system/message_pipe_dispatcher_unittest.cc b/third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher_unittest.cc
index b5562b0..b5562b0 100644
--- a/mojo/edk/system/message_pipe_dispatcher_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/message_pipe_dispatcher_unittest.cc
diff --git a/mojo/edk/system/message_pipe_endpoint.cc b/third_party/mojo/src/mojo/edk/system/message_pipe_endpoint.cc
index 4b8bc5e..4b8bc5e 100644
--- a/mojo/edk/system/message_pipe_endpoint.cc
+++ b/third_party/mojo/src/mojo/edk/system/message_pipe_endpoint.cc
diff --git a/mojo/edk/system/message_pipe_endpoint.h b/third_party/mojo/src/mojo/edk/system/message_pipe_endpoint.h
index 0b5f12e..0b5f12e 100644
--- a/mojo/edk/system/message_pipe_endpoint.h
+++ b/third_party/mojo/src/mojo/edk/system/message_pipe_endpoint.h
diff --git a/mojo/edk/system/message_pipe_perftest.cc b/third_party/mojo/src/mojo/edk/system/message_pipe_perftest.cc
index 2387782..2387782 100644
--- a/mojo/edk/system/message_pipe_perftest.cc
+++ b/third_party/mojo/src/mojo/edk/system/message_pipe_perftest.cc
diff --git a/mojo/edk/system/message_pipe_test_utils.cc b/third_party/mojo/src/mojo/edk/system/message_pipe_test_utils.cc
index f227543..f227543 100644
--- a/mojo/edk/system/message_pipe_test_utils.cc
+++ b/third_party/mojo/src/mojo/edk/system/message_pipe_test_utils.cc
diff --git a/mojo/edk/system/message_pipe_test_utils.h b/third_party/mojo/src/mojo/edk/system/message_pipe_test_utils.h
index c9d9c8b..c9d9c8b 100644
--- a/mojo/edk/system/message_pipe_test_utils.h
+++ b/third_party/mojo/src/mojo/edk/system/message_pipe_test_utils.h
diff --git a/mojo/edk/system/message_pipe_unittest.cc b/third_party/mojo/src/mojo/edk/system/message_pipe_unittest.cc
index a30b636..a30b636 100644
--- a/mojo/edk/system/message_pipe_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/message_pipe_unittest.cc
diff --git a/mojo/edk/system/multiprocess_message_pipe_unittest.cc b/third_party/mojo/src/mojo/edk/system/multiprocess_message_pipe_unittest.cc
index af3b3bb..af3b3bb 100644
--- a/mojo/edk/system/multiprocess_message_pipe_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/multiprocess_message_pipe_unittest.cc
diff --git a/mojo/edk/system/options_validation.h b/third_party/mojo/src/mojo/edk/system/options_validation.h
index 9724e38..9724e38 100644
--- a/mojo/edk/system/options_validation.h
+++ b/third_party/mojo/src/mojo/edk/system/options_validation.h
diff --git a/mojo/edk/system/options_validation_unittest.cc b/third_party/mojo/src/mojo/edk/system/options_validation_unittest.cc
index 89c4e60..89c4e60 100644
--- a/mojo/edk/system/options_validation_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/options_validation_unittest.cc
diff --git a/mojo/edk/system/platform_handle_dispatcher.cc b/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.cc
index f064c67..f064c67 100644
--- a/mojo/edk/system/platform_handle_dispatcher.cc
+++ b/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.cc
diff --git a/mojo/edk/system/platform_handle_dispatcher.h b/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h
index 6eb56b7..6eb56b7 100644
--- a/mojo/edk/system/platform_handle_dispatcher.h
+++ b/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h
diff --git a/mojo/edk/system/platform_handle_dispatcher_unittest.cc b/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher_unittest.cc
index dae53b4..dae53b4 100644
--- a/mojo/edk/system/platform_handle_dispatcher_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher_unittest.cc
diff --git a/mojo/edk/system/proxy_message_pipe_endpoint.cc b/third_party/mojo/src/mojo/edk/system/proxy_message_pipe_endpoint.cc
index 5f0f2e9..5f0f2e9 100644
--- a/mojo/edk/system/proxy_message_pipe_endpoint.cc
+++ b/third_party/mojo/src/mojo/edk/system/proxy_message_pipe_endpoint.cc
diff --git a/mojo/edk/system/proxy_message_pipe_endpoint.h b/third_party/mojo/src/mojo/edk/system/proxy_message_pipe_endpoint.h
index 6e10699..6e10699 100644
--- a/mojo/edk/system/proxy_message_pipe_endpoint.h
+++ b/third_party/mojo/src/mojo/edk/system/proxy_message_pipe_endpoint.h
diff --git a/mojo/edk/system/raw_channel.cc b/third_party/mojo/src/mojo/edk/system/raw_channel.cc
index aff1110..aff1110 100644
--- a/mojo/edk/system/raw_channel.cc
+++ b/third_party/mojo/src/mojo/edk/system/raw_channel.cc
diff --git a/mojo/edk/system/raw_channel.h b/third_party/mojo/src/mojo/edk/system/raw_channel.h
index f567767..f567767 100644
--- a/mojo/edk/system/raw_channel.h
+++ b/third_party/mojo/src/mojo/edk/system/raw_channel.h
diff --git a/mojo/edk/system/raw_channel_posix.cc b/third_party/mojo/src/mojo/edk/system/raw_channel_posix.cc
index 078f8cb..078f8cb 100644
--- a/mojo/edk/system/raw_channel_posix.cc
+++ b/third_party/mojo/src/mojo/edk/system/raw_channel_posix.cc
diff --git a/mojo/edk/system/raw_channel_unittest.cc b/third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc
index a8cbcba..a8cbcba 100644
--- a/mojo/edk/system/raw_channel_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc
diff --git a/mojo/edk/system/raw_channel_win.cc b/third_party/mojo/src/mojo/edk/system/raw_channel_win.cc
index 7ec7ad7..7ec7ad7 100644
--- a/mojo/edk/system/raw_channel_win.cc
+++ b/third_party/mojo/src/mojo/edk/system/raw_channel_win.cc
diff --git a/mojo/edk/system/remote_message_pipe_unittest.cc b/third_party/mojo/src/mojo/edk/system/remote_message_pipe_unittest.cc
index 1860c23..1860c23 100644
--- a/mojo/edk/system/remote_message_pipe_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/remote_message_pipe_unittest.cc
diff --git a/mojo/edk/system/run_all_unittests.cc b/third_party/mojo/src/mojo/edk/system/run_all_unittests.cc
index cd61337..cd61337 100644
--- a/mojo/edk/system/run_all_unittests.cc
+++ b/third_party/mojo/src/mojo/edk/system/run_all_unittests.cc
diff --git a/mojo/edk/system/shared_buffer_dispatcher.cc b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc
index db823d5..db823d5 100644
--- a/mojo/edk/system/shared_buffer_dispatcher.cc
+++ b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc
diff --git a/mojo/edk/system/shared_buffer_dispatcher.h b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.h
index db04d2a..db04d2a 100644
--- a/mojo/edk/system/shared_buffer_dispatcher.h
+++ b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.h
diff --git a/mojo/edk/system/shared_buffer_dispatcher_unittest.cc b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher_unittest.cc
index 29dcb57..29dcb57 100644
--- a/mojo/edk/system/shared_buffer_dispatcher_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher_unittest.cc
diff --git a/mojo/edk/system/simple_dispatcher.cc b/third_party/mojo/src/mojo/edk/system/simple_dispatcher.cc
index f7db875..f7db875 100644
--- a/mojo/edk/system/simple_dispatcher.cc
+++ b/third_party/mojo/src/mojo/edk/system/simple_dispatcher.cc
diff --git a/mojo/edk/system/simple_dispatcher.h b/third_party/mojo/src/mojo/edk/system/simple_dispatcher.h
index eddf614..eddf614 100644
--- a/mojo/edk/system/simple_dispatcher.h
+++ b/third_party/mojo/src/mojo/edk/system/simple_dispatcher.h
diff --git a/mojo/edk/system/simple_dispatcher_unittest.cc b/third_party/mojo/src/mojo/edk/system/simple_dispatcher_unittest.cc
index b8e57e9..b8e57e9 100644
--- a/mojo/edk/system/simple_dispatcher_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/simple_dispatcher_unittest.cc
diff --git a/mojo/edk/system/system_impl_export.h b/third_party/mojo/src/mojo/edk/system/system_impl_export.h
index 5bbf005..5bbf005 100644
--- a/mojo/edk/system/system_impl_export.h
+++ b/third_party/mojo/src/mojo/edk/system/system_impl_export.h
diff --git a/mojo/edk/system/test_utils.cc b/third_party/mojo/src/mojo/edk/system/test_utils.cc
index d43a818..d43a818 100644
--- a/mojo/edk/system/test_utils.cc
+++ b/third_party/mojo/src/mojo/edk/system/test_utils.cc
diff --git a/mojo/edk/system/test_utils.h b/third_party/mojo/src/mojo/edk/system/test_utils.h
index b16c516..b16c516 100644
--- a/mojo/edk/system/test_utils.h
+++ b/third_party/mojo/src/mojo/edk/system/test_utils.h
diff --git a/mojo/edk/system/transport_data.cc b/third_party/mojo/src/mojo/edk/system/transport_data.cc
index d388151..d388151 100644
--- a/mojo/edk/system/transport_data.cc
+++ b/third_party/mojo/src/mojo/edk/system/transport_data.cc
diff --git a/mojo/edk/system/transport_data.h b/third_party/mojo/src/mojo/edk/system/transport_data.h
index 1258f49..1258f49 100644
--- a/mojo/edk/system/transport_data.h
+++ b/third_party/mojo/src/mojo/edk/system/transport_data.h
diff --git a/mojo/edk/system/unique_identifier.cc b/third_party/mojo/src/mojo/edk/system/unique_identifier.cc
index e851e2b..e851e2b 100644
--- a/mojo/edk/system/unique_identifier.cc
+++ b/third_party/mojo/src/mojo/edk/system/unique_identifier.cc
diff --git a/mojo/edk/system/unique_identifier.h b/third_party/mojo/src/mojo/edk/system/unique_identifier.h
index a7f68ba..a7f68ba 100644
--- a/mojo/edk/system/unique_identifier.h
+++ b/third_party/mojo/src/mojo/edk/system/unique_identifier.h
diff --git a/mojo/edk/system/unique_identifier_unittest.cc b/third_party/mojo/src/mojo/edk/system/unique_identifier_unittest.cc
index 2be4f6e..2be4f6e 100644
--- a/mojo/edk/system/unique_identifier_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/unique_identifier_unittest.cc
diff --git a/mojo/edk/system/waiter.cc b/third_party/mojo/src/mojo/edk/system/waiter.cc
index f18edc8..f18edc8 100644
--- a/mojo/edk/system/waiter.cc
+++ b/third_party/mojo/src/mojo/edk/system/waiter.cc
diff --git a/mojo/edk/system/waiter.h b/third_party/mojo/src/mojo/edk/system/waiter.h
index b9b63cd..b9b63cd 100644
--- a/mojo/edk/system/waiter.h
+++ b/third_party/mojo/src/mojo/edk/system/waiter.h
diff --git a/mojo/edk/system/waiter_test_utils.cc b/third_party/mojo/src/mojo/edk/system/waiter_test_utils.cc
index ea243ed1..ea243ed1 100644
--- a/mojo/edk/system/waiter_test_utils.cc
+++ b/third_party/mojo/src/mojo/edk/system/waiter_test_utils.cc
diff --git a/mojo/edk/system/waiter_test_utils.h b/third_party/mojo/src/mojo/edk/system/waiter_test_utils.h
index b11d78d..b11d78d 100644
--- a/mojo/edk/system/waiter_test_utils.h
+++ b/third_party/mojo/src/mojo/edk/system/waiter_test_utils.h
diff --git a/mojo/edk/system/waiter_unittest.cc b/third_party/mojo/src/mojo/edk/system/waiter_unittest.cc
index 859ff0d..859ff0d 100644
--- a/mojo/edk/system/waiter_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/waiter_unittest.cc
diff --git a/mojo/edk/test/BUILD.gn b/third_party/mojo/src/mojo/edk/test/BUILD.gn
index d05f6d4..d05f6d4 100644
--- a/mojo/edk/test/BUILD.gn
+++ b/third_party/mojo/src/mojo/edk/test/BUILD.gn
diff --git a/mojo/edk/test/multiprocess_test_helper.cc b/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.cc
index 6dd8b72..6dd8b72 100644
--- a/mojo/edk/test/multiprocess_test_helper.cc
+++ b/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.cc
diff --git a/mojo/edk/test/multiprocess_test_helper.h b/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.h
index e40b309c..e40b309c 100644
--- a/mojo/edk/test/multiprocess_test_helper.h
+++ b/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.h
diff --git a/mojo/edk/test/multiprocess_test_helper_unittest.cc b/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper_unittest.cc
index 93496fb..93496fb 100644
--- a/mojo/edk/test/multiprocess_test_helper_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper_unittest.cc
diff --git a/mojo/edk/test/run_all_perftests.cc b/third_party/mojo/src/mojo/edk/test/run_all_perftests.cc
index f0eacc6..f0eacc6 100644
--- a/mojo/edk/test/run_all_perftests.cc
+++ b/third_party/mojo/src/mojo/edk/test/run_all_perftests.cc
diff --git a/mojo/edk/test/run_all_unittests.cc b/third_party/mojo/src/mojo/edk/test/run_all_unittests.cc
index 166a73e..166a73e 100644
--- a/mojo/edk/test/run_all_unittests.cc
+++ b/third_party/mojo/src/mojo/edk/test/run_all_unittests.cc
diff --git a/mojo/edk/test/test_support_impl.cc b/third_party/mojo/src/mojo/edk/test/test_support_impl.cc
index 34b32ce..34b32ce 100644
--- a/mojo/edk/test/test_support_impl.cc
+++ b/third_party/mojo/src/mojo/edk/test/test_support_impl.cc
diff --git a/mojo/edk/test/test_support_impl.h b/third_party/mojo/src/mojo/edk/test/test_support_impl.h
index 533bfce..533bfce 100644
--- a/mojo/edk/test/test_support_impl.h
+++ b/third_party/mojo/src/mojo/edk/test/test_support_impl.h
diff --git a/mojo/edk/test/test_utils.h b/third_party/mojo/src/mojo/edk/test/test_utils.h
index 9287457..9287457 100644
--- a/mojo/edk/test/test_utils.h
+++ b/third_party/mojo/src/mojo/edk/test/test_utils.h
diff --git a/mojo/edk/test/test_utils_posix.cc b/third_party/mojo/src/mojo/edk/test/test_utils_posix.cc
index 6491baf..6491baf 100644
--- a/mojo/edk/test/test_utils_posix.cc
+++ b/third_party/mojo/src/mojo/edk/test/test_utils_posix.cc
diff --git a/mojo/edk/test/test_utils_win.cc b/third_party/mojo/src/mojo/edk/test/test_utils_win.cc
index 2387945..2387945 100644
--- a/mojo/edk/test/test_utils_win.cc
+++ b/third_party/mojo/src/mojo/edk/test/test_utils_win.cc
diff --git a/mojo/public/BUILD.gn b/third_party/mojo/src/mojo/public/BUILD.gn
index 33e05c6..33e05c6 100644
--- a/mojo/public/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/BUILD.gn
diff --git a/mojo/public/DEPS b/third_party/mojo/src/mojo/public/DEPS
index 0c679b9..0c679b9 100644
--- a/mojo/public/DEPS
+++ b/third_party/mojo/src/mojo/public/DEPS
diff --git a/mojo/public/README.md b/third_party/mojo/src/mojo/public/README.md
index a31a8a8..a31a8a8 100644
--- a/mojo/public/README.md
+++ b/third_party/mojo/src/mojo/public/README.md
diff --git a/third_party/mojo/src/mojo/public/VERSION b/third_party/mojo/src/mojo/public/VERSION
new file mode 100644
index 0000000..9285f53
--- /dev/null
+++ b/third_party/mojo/src/mojo/public/VERSION
@@ -0,0 +1 @@
+b737c0531e299ad494725c518699843e76ff84f5
\ No newline at end of file
diff --git a/mojo/public/build/config/BUILD.gn b/third_party/mojo/src/mojo/public/build/config/BUILD.gn
index c104b8b..c104b8b 100644
--- a/mojo/public/build/config/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/build/config/BUILD.gn
diff --git a/mojo/public/c/DEPS b/third_party/mojo/src/mojo/public/c/DEPS
index 5272770..5272770 100644
--- a/mojo/public/c/DEPS
+++ b/third_party/mojo/src/mojo/public/c/DEPS
diff --git a/mojo/public/c/README.md b/third_party/mojo/src/mojo/public/c/README.md
index 8e11545..8e11545 100644
--- a/mojo/public/c/README.md
+++ b/third_party/mojo/src/mojo/public/c/README.md
diff --git a/mojo/public/c/environment/BUILD.gn b/third_party/mojo/src/mojo/public/c/environment/BUILD.gn
index 3fd1689..3fd1689 100644
--- a/mojo/public/c/environment/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/c/environment/BUILD.gn
diff --git a/mojo/public/c/environment/async_waiter.h b/third_party/mojo/src/mojo/public/c/environment/async_waiter.h
index b5a1f75..b5a1f75 100644
--- a/mojo/public/c/environment/async_waiter.h
+++ b/third_party/mojo/src/mojo/public/c/environment/async_waiter.h
diff --git a/mojo/public/c/environment/logger.h b/third_party/mojo/src/mojo/public/c/environment/logger.h
index c492a66..c492a66 100644
--- a/mojo/public/c/environment/logger.h
+++ b/third_party/mojo/src/mojo/public/c/environment/logger.h
diff --git a/mojo/public/c/gles2/BUILD.gn b/third_party/mojo/src/mojo/public/c/gles2/BUILD.gn
index b680bec..b680bec 100644
--- a/mojo/public/c/gles2/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/c/gles2/BUILD.gn
diff --git a/mojo/public/c/gles2/DEPS b/third_party/mojo/src/mojo/public/c/gles2/DEPS
index 3887457..3887457 100644
--- a/mojo/public/c/gles2/DEPS
+++ b/third_party/mojo/src/mojo/public/c/gles2/DEPS
diff --git a/mojo/public/c/gles2/chromium_sync_point.h b/third_party/mojo/src/mojo/public/c/gles2/chromium_sync_point.h
index 6369712..6369712 100644
--- a/mojo/public/c/gles2/chromium_sync_point.h
+++ b/third_party/mojo/src/mojo/public/c/gles2/chromium_sync_point.h
diff --git a/mojo/public/c/gles2/chromium_texture_mailbox.h b/third_party/mojo/src/mojo/public/c/gles2/chromium_texture_mailbox.h
index 177ebbb..177ebbb 100644
--- a/mojo/public/c/gles2/chromium_texture_mailbox.h
+++ b/third_party/mojo/src/mojo/public/c/gles2/chromium_texture_mailbox.h
diff --git a/mojo/public/c/gles2/gles2.h b/third_party/mojo/src/mojo/public/c/gles2/gles2.h
index 36c6f7f..36c6f7f 100644
--- a/mojo/public/c/gles2/gles2.h
+++ b/third_party/mojo/src/mojo/public/c/gles2/gles2.h
diff --git a/mojo/public/c/gles2/gles2_call_visitor_autogen.h b/third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_autogen.h
index 64adecf..64adecf 100644
--- a/mojo/public/c/gles2/gles2_call_visitor_autogen.h
+++ b/third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_autogen.h
diff --git a/mojo/public/c/gles2/gles2_call_visitor_chromium_sync_point_autogen.h b/third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_chromium_sync_point_autogen.h
index 3c3c4b9..3c3c4b9 100644
--- a/mojo/public/c/gles2/gles2_call_visitor_chromium_sync_point_autogen.h
+++ b/third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_chromium_sync_point_autogen.h
diff --git a/mojo/public/c/gles2/gles2_call_visitor_chromium_texture_mailbox_autogen.h b/third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_chromium_texture_mailbox_autogen.h
index 184c2f2..184c2f2 100644
--- a/mojo/public/c/gles2/gles2_call_visitor_chromium_texture_mailbox_autogen.h
+++ b/third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_chromium_texture_mailbox_autogen.h
diff --git a/mojo/public/c/gles2/gles2_export.h b/third_party/mojo/src/mojo/public/c/gles2/gles2_export.h
index 60667b1..60667b1 100644
--- a/mojo/public/c/gles2/gles2_export.h
+++ b/third_party/mojo/src/mojo/public/c/gles2/gles2_export.h
diff --git a/mojo/public/c/gles2/gles2_types.h b/third_party/mojo/src/mojo/public/c/gles2/gles2_types.h
index 3ecf4db..3ecf4db 100644
--- a/mojo/public/c/gles2/gles2_types.h
+++ b/third_party/mojo/src/mojo/public/c/gles2/gles2_types.h
diff --git a/mojo/public/c/system/BUILD.gn b/third_party/mojo/src/mojo/public/c/system/BUILD.gn
index 6a3827c..6a3827c 100644
--- a/mojo/public/c/system/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/c/system/BUILD.gn
diff --git a/mojo/public/c/system/buffer.h b/third_party/mojo/src/mojo/public/c/system/buffer.h
index 97bc340..97bc340 100644
--- a/mojo/public/c/system/buffer.h
+++ b/third_party/mojo/src/mojo/public/c/system/buffer.h
diff --git a/mojo/public/c/system/core.h b/third_party/mojo/src/mojo/public/c/system/core.h
index 0e78786..0e78786 100644
--- a/mojo/public/c/system/core.h
+++ b/third_party/mojo/src/mojo/public/c/system/core.h
diff --git a/mojo/public/c/system/data_pipe.h b/third_party/mojo/src/mojo/public/c/system/data_pipe.h
index 089ead3..089ead3 100644
--- a/mojo/public/c/system/data_pipe.h
+++ b/third_party/mojo/src/mojo/public/c/system/data_pipe.h
diff --git a/mojo/public/c/system/functions.h b/third_party/mojo/src/mojo/public/c/system/functions.h
index 5e0a0c4..5e0a0c4 100644
--- a/mojo/public/c/system/functions.h
+++ b/third_party/mojo/src/mojo/public/c/system/functions.h
diff --git a/mojo/public/c/system/macros.h b/third_party/mojo/src/mojo/public/c/system/macros.h
index 7f28e18..7f28e18 100644
--- a/mojo/public/c/system/macros.h
+++ b/third_party/mojo/src/mojo/public/c/system/macros.h
diff --git a/mojo/public/c/system/main.h b/third_party/mojo/src/mojo/public/c/system/main.h
index 31e2012..31e2012 100644
--- a/mojo/public/c/system/main.h
+++ b/third_party/mojo/src/mojo/public/c/system/main.h
diff --git a/mojo/public/c/system/message_pipe.h b/third_party/mojo/src/mojo/public/c/system/message_pipe.h
index 97d8887..97d8887 100644
--- a/mojo/public/c/system/message_pipe.h
+++ b/third_party/mojo/src/mojo/public/c/system/message_pipe.h
diff --git a/mojo/public/c/system/system_export.h b/third_party/mojo/src/mojo/public/c/system/system_export.h
index bc3b459..bc3b459 100644
--- a/mojo/public/c/system/system_export.h
+++ b/third_party/mojo/src/mojo/public/c/system/system_export.h
diff --git a/mojo/public/c/system/tests/BUILD.gn b/third_party/mojo/src/mojo/public/c/system/tests/BUILD.gn
index 14b15f6..14b15f6 100644
--- a/mojo/public/c/system/tests/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/c/system/tests/BUILD.gn
diff --git a/mojo/public/c/system/tests/core_perftest.cc b/third_party/mojo/src/mojo/public/c/system/tests/core_perftest.cc
index 23fd92b..23fd92b 100644
--- a/mojo/public/c/system/tests/core_perftest.cc
+++ b/third_party/mojo/src/mojo/public/c/system/tests/core_perftest.cc
diff --git a/mojo/public/c/system/tests/core_unittest.cc b/third_party/mojo/src/mojo/public/c/system/tests/core_unittest.cc
index 2f3ef62..2f3ef62 100644
--- a/mojo/public/c/system/tests/core_unittest.cc
+++ b/third_party/mojo/src/mojo/public/c/system/tests/core_unittest.cc
diff --git a/mojo/public/c/system/tests/core_unittest_pure_c.c b/third_party/mojo/src/mojo/public/c/system/tests/core_unittest_pure_c.c
index fd4d9e9..fd4d9e9 100644
--- a/mojo/public/c/system/tests/core_unittest_pure_c.c
+++ b/third_party/mojo/src/mojo/public/c/system/tests/core_unittest_pure_c.c
diff --git a/mojo/public/c/system/tests/macros_unittest.cc b/third_party/mojo/src/mojo/public/c/system/tests/macros_unittest.cc
index b22e124..b22e124 100644
--- a/mojo/public/c/system/tests/macros_unittest.cc
+++ b/third_party/mojo/src/mojo/public/c/system/tests/macros_unittest.cc
diff --git a/mojo/public/c/system/types.h b/third_party/mojo/src/mojo/public/c/system/types.h
index a88b024..a88b024 100644
--- a/mojo/public/c/system/types.h
+++ b/third_party/mojo/src/mojo/public/c/system/types.h
diff --git a/mojo/public/c/test_support/BUILD.gn b/third_party/mojo/src/mojo/public/c/test_support/BUILD.gn
index 4f7fce2..4f7fce2 100644
--- a/mojo/public/c/test_support/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/c/test_support/BUILD.gn
diff --git a/mojo/public/c/test_support/test_support.h b/third_party/mojo/src/mojo/public/c/test_support/test_support.h
index 73a2eef..73a2eef 100644
--- a/mojo/public/c/test_support/test_support.h
+++ b/third_party/mojo/src/mojo/public/c/test_support/test_support.h
diff --git a/mojo/public/c/test_support/test_support_export.h b/third_party/mojo/src/mojo/public/c/test_support/test_support_export.h
index e22a9e3..e22a9e3 100644
--- a/mojo/public/c/test_support/test_support_export.h
+++ b/third_party/mojo/src/mojo/public/c/test_support/test_support_export.h
diff --git a/mojo/public/cpp/DEPS b/third_party/mojo/src/mojo/public/cpp/DEPS
index 74acd7c..74acd7c 100644
--- a/mojo/public/cpp/DEPS
+++ b/third_party/mojo/src/mojo/public/cpp/DEPS
diff --git a/mojo/public/cpp/README.md b/third_party/mojo/src/mojo/public/cpp/README.md
index 8f03d98..8f03d98 100644
--- a/mojo/public/cpp/README.md
+++ b/third_party/mojo/src/mojo/public/cpp/README.md
diff --git a/mojo/public/cpp/application/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/application/BUILD.gn
index 1c8842d..1c8842d 100644
--- a/mojo/public/cpp/application/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/cpp/application/BUILD.gn
diff --git a/mojo/public/cpp/application/DEPS b/third_party/mojo/src/mojo/public/cpp/application/DEPS
index 503eebc..503eebc 100644
--- a/mojo/public/cpp/application/DEPS
+++ b/third_party/mojo/src/mojo/public/cpp/application/DEPS
diff --git a/mojo/public/cpp/application/application_connection.h b/third_party/mojo/src/mojo/public/cpp/application/application_connection.h
index d5d6dde..d5d6dde 100644
--- a/mojo/public/cpp/application/application_connection.h
+++ b/third_party/mojo/src/mojo/public/cpp/application/application_connection.h
diff --git a/mojo/public/cpp/application/application_delegate.h b/third_party/mojo/src/mojo/public/cpp/application/application_delegate.h
index b0f2916..b0f2916 100644
--- a/mojo/public/cpp/application/application_delegate.h
+++ b/third_party/mojo/src/mojo/public/cpp/application/application_delegate.h
diff --git a/mojo/public/cpp/application/application_impl.h b/third_party/mojo/src/mojo/public/cpp/application/application_impl.h
index 0ea22c9..0ea22c9 100644
--- a/mojo/public/cpp/application/application_impl.h
+++ b/third_party/mojo/src/mojo/public/cpp/application/application_impl.h
diff --git a/mojo/public/cpp/application/application_runner.h b/third_party/mojo/src/mojo/public/cpp/application/application_runner.h
index b88ec8e..b88ec8e 100644
--- a/mojo/public/cpp/application/application_runner.h
+++ b/third_party/mojo/src/mojo/public/cpp/application/application_runner.h
diff --git a/mojo/public/cpp/application/application_test_base.h b/third_party/mojo/src/mojo/public/cpp/application/application_test_base.h
index bdf2f8b..bdf2f8b 100644
--- a/mojo/public/cpp/application/application_test_base.h
+++ b/third_party/mojo/src/mojo/public/cpp/application/application_test_base.h
diff --git a/mojo/public/cpp/application/connect.h b/third_party/mojo/src/mojo/public/cpp/application/connect.h
index a41c028..a41c028 100644
--- a/mojo/public/cpp/application/connect.h
+++ b/third_party/mojo/src/mojo/public/cpp/application/connect.h
diff --git a/mojo/public/cpp/application/interface_factory.h b/third_party/mojo/src/mojo/public/cpp/application/interface_factory.h
index 8840fcb..8840fcb 100644
--- a/mojo/public/cpp/application/interface_factory.h
+++ b/third_party/mojo/src/mojo/public/cpp/application/interface_factory.h
diff --git a/mojo/public/cpp/application/interface_factory_impl.h b/third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h
index 72d3254..72d3254 100644
--- a/mojo/public/cpp/application/interface_factory_impl.h
+++ b/third_party/mojo/src/mojo/public/cpp/application/interface_factory_impl.h
diff --git a/mojo/public/cpp/application/lazy_interface_ptr.h b/third_party/mojo/src/mojo/public/cpp/application/lazy_interface_ptr.h
index a9b57db..a9b57db 100644
--- a/mojo/public/cpp/application/lazy_interface_ptr.h
+++ b/third_party/mojo/src/mojo/public/cpp/application/lazy_interface_ptr.h
diff --git a/mojo/public/cpp/application/lib/DEPS b/third_party/mojo/src/mojo/public/cpp/application/lib/DEPS
index a04ed0f..a04ed0f 100644
--- a/mojo/public/cpp/application/lib/DEPS
+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/DEPS
diff --git a/mojo/public/cpp/application/lib/application_connection.cc b/third_party/mojo/src/mojo/public/cpp/application/lib/application_connection.cc
index d557817..d557817 100644
--- a/mojo/public/cpp/application/lib/application_connection.cc
+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/application_connection.cc
diff --git a/mojo/public/cpp/application/lib/application_delegate.cc b/third_party/mojo/src/mojo/public/cpp/application/lib/application_delegate.cc
index bd6aebd..bd6aebd 100644
--- a/mojo/public/cpp/application/lib/application_delegate.cc
+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/application_delegate.cc
diff --git a/mojo/public/cpp/application/lib/application_impl.cc b/third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc
index 6677003..6677003 100644
--- a/mojo/public/cpp/application/lib/application_impl.cc
+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/application_impl.cc
diff --git a/mojo/public/cpp/application/lib/application_runner.cc b/third_party/mojo/src/mojo/public/cpp/application/lib/application_runner.cc
index dec74489..dec74489 100644
--- a/mojo/public/cpp/application/lib/application_runner.cc
+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/application_runner.cc
diff --git a/mojo/public/cpp/application/lib/application_test_base.cc b/third_party/mojo/src/mojo/public/cpp/application/lib/application_test_base.cc
index 20a60a1..20a60a1 100644
--- a/mojo/public/cpp/application/lib/application_test_base.cc
+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/application_test_base.cc
diff --git a/mojo/public/cpp/application/lib/application_test_main.cc b/third_party/mojo/src/mojo/public/cpp/application/lib/application_test_main.cc
index 47f36e9..47f36e9 100644
--- a/mojo/public/cpp/application/lib/application_test_main.cc
+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/application_test_main.cc
diff --git a/mojo/public/cpp/application/lib/service_connector.cc b/third_party/mojo/src/mojo/public/cpp/application/lib/service_connector.cc
index ada5d9c..ada5d9c 100644
--- a/mojo/public/cpp/application/lib/service_connector.cc
+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/service_connector.cc
diff --git a/mojo/public/cpp/application/lib/service_connector.h b/third_party/mojo/src/mojo/public/cpp/application/lib/service_connector.h
index 70c1380..70c1380 100644
--- a/mojo/public/cpp/application/lib/service_connector.h
+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/service_connector.h
diff --git a/mojo/public/cpp/application/lib/service_provider_impl.cc b/third_party/mojo/src/mojo/public/cpp/application/lib/service_provider_impl.cc
index 08a0648..08a0648 100644
--- a/mojo/public/cpp/application/lib/service_provider_impl.cc
+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/service_provider_impl.cc
diff --git a/mojo/public/cpp/application/lib/service_registry.cc b/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.cc
index d934a16..d934a16 100644
--- a/mojo/public/cpp/application/lib/service_registry.cc
+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.cc
diff --git a/mojo/public/cpp/application/lib/service_registry.h b/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.h
index af1613b..af1613b 100644
--- a/mojo/public/cpp/application/lib/service_registry.h
+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/service_registry.h
diff --git a/mojo/public/cpp/application/lib/weak_service_provider.cc b/third_party/mojo/src/mojo/public/cpp/application/lib/weak_service_provider.cc
index de0cb6c..de0cb6c 100644
--- a/mojo/public/cpp/application/lib/weak_service_provider.cc
+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/weak_service_provider.cc
diff --git a/mojo/public/cpp/application/lib/weak_service_provider.h b/third_party/mojo/src/mojo/public/cpp/application/lib/weak_service_provider.h
index 3d959d1..3d959d1 100644
--- a/mojo/public/cpp/application/lib/weak_service_provider.h
+++ b/third_party/mojo/src/mojo/public/cpp/application/lib/weak_service_provider.h
diff --git a/mojo/public/cpp/application/service_provider_impl.h b/third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h
index 45ad7b8..45ad7b8 100644
--- a/mojo/public/cpp/application/service_provider_impl.h
+++ b/third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h
diff --git a/mojo/public/cpp/application/tests/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/application/tests/BUILD.gn
index 7766a7d..7766a7d 100644
--- a/mojo/public/cpp/application/tests/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/cpp/application/tests/BUILD.gn
diff --git a/mojo/public/cpp/application/tests/service_registry_unittest.cc b/third_party/mojo/src/mojo/public/cpp/application/tests/service_registry_unittest.cc
index 283bf14..283bf14 100644
--- a/mojo/public/cpp/application/tests/service_registry_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/application/tests/service_registry_unittest.cc
diff --git a/mojo/public/cpp/bindings/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/bindings/BUILD.gn
index 515c3e1..515c3e1 100644
--- a/mojo/public/cpp/bindings/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/BUILD.gn
diff --git a/mojo/public/cpp/bindings/DEPS b/third_party/mojo/src/mojo/public/cpp/bindings/DEPS
index 2a0496e..2a0496e 100644
--- a/mojo/public/cpp/bindings/DEPS
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/DEPS
diff --git a/mojo/public/cpp/bindings/array.h b/third_party/mojo/src/mojo/public/cpp/bindings/array.h
index ca4e9cc..ca4e9cc 100644
--- a/mojo/public/cpp/bindings/array.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/array.h
diff --git a/mojo/public/cpp/bindings/binding.h b/third_party/mojo/src/mojo/public/cpp/bindings/binding.h
index 4ecc6a8..4ecc6a8 100644
--- a/mojo/public/cpp/bindings/binding.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/binding.h
diff --git a/mojo/public/cpp/bindings/callback.h b/third_party/mojo/src/mojo/public/cpp/bindings/callback.h
index d7bab16..d7bab16 100644
--- a/mojo/public/cpp/bindings/callback.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/callback.h
diff --git a/mojo/public/cpp/bindings/error_handler.h b/third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h
index 8ce1af2..8ce1af2 100644
--- a/mojo/public/cpp/bindings/error_handler.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h
diff --git a/mojo/public/cpp/bindings/interface_impl.h b/third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h
index 5663cc3..5663cc3 100644
--- a/mojo/public/cpp/bindings/interface_impl.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h
diff --git a/mojo/public/cpp/bindings/interface_ptr.h b/third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h
index a2ede4d..a2ede4d 100644
--- a/mojo/public/cpp/bindings/interface_ptr.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h
diff --git a/mojo/public/cpp/bindings/interface_request.h b/third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h
index 1723330..1723330 100644
--- a/mojo/public/cpp/bindings/interface_request.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h
diff --git a/mojo/public/cpp/bindings/lib/DEPS b/third_party/mojo/src/mojo/public/cpp/bindings/lib/DEPS
index b809b58..b809b58 100644
--- a/mojo/public/cpp/bindings/lib/DEPS
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/DEPS
diff --git a/mojo/public/cpp/bindings/lib/TODO b/third_party/mojo/src/mojo/public/cpp/bindings/lib/TODO
index 21bcb6f..21bcb6f 100644
--- a/mojo/public/cpp/bindings/lib/TODO
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/TODO
diff --git a/mojo/public/cpp/bindings/lib/array_internal.cc b/third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.cc
index 61e4b0d..61e4b0d 100644
--- a/mojo/public/cpp/bindings/lib/array_internal.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.cc
diff --git a/mojo/public/cpp/bindings/lib/array_internal.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.h
index eb25e35..eb25e35 100644
--- a/mojo/public/cpp/bindings/lib/array_internal.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/array_internal.h
diff --git a/mojo/public/cpp/bindings/lib/array_serialization.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/array_serialization.h
index eacf298..eacf298 100644
--- a/mojo/public/cpp/bindings/lib/array_serialization.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/array_serialization.h
diff --git a/mojo/public/cpp/bindings/lib/bindings_internal.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_internal.h
index ec70d37..ec70d37 100644
--- a/mojo/public/cpp/bindings/lib/bindings_internal.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_internal.h
diff --git a/mojo/public/cpp/bindings/lib/bindings_serialization.cc b/third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.cc
index 936d0ca..936d0ca 100644
--- a/mojo/public/cpp/bindings/lib/bindings_serialization.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.cc
diff --git a/mojo/public/cpp/bindings/lib/bindings_serialization.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.h
index 6bebf90..6bebf90 100644
--- a/mojo/public/cpp/bindings/lib/bindings_serialization.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/bindings_serialization.h
diff --git a/mojo/public/cpp/bindings/lib/bounds_checker.cc b/third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.cc
index 5b96b2d..5b96b2d 100644
--- a/mojo/public/cpp/bindings/lib/bounds_checker.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.cc
diff --git a/mojo/public/cpp/bindings/lib/bounds_checker.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.h
index f0520be..f0520be 100644
--- a/mojo/public/cpp/bindings/lib/bounds_checker.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/bounds_checker.h
diff --git a/mojo/public/cpp/bindings/lib/buffer.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/buffer.h
index c3b570e..c3b570e 100644
--- a/mojo/public/cpp/bindings/lib/buffer.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/buffer.h
diff --git a/mojo/public/cpp/bindings/lib/callback_internal.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/callback_internal.h
index f76ebef..f76ebef 100644
--- a/mojo/public/cpp/bindings/lib/callback_internal.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/callback_internal.h
diff --git a/mojo/public/cpp/bindings/lib/connector.cc b/third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.cc
index 4f965ee2..4f965ee2 100644
--- a/mojo/public/cpp/bindings/lib/connector.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.cc
diff --git a/mojo/public/cpp/bindings/lib/connector.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.h
index 7c1d445..7c1d445 100644
--- a/mojo/public/cpp/bindings/lib/connector.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.h
diff --git a/mojo/public/cpp/bindings/lib/filter_chain.cc b/third_party/mojo/src/mojo/public/cpp/bindings/lib/filter_chain.cc
index d32eb78..d32eb78 100644
--- a/mojo/public/cpp/bindings/lib/filter_chain.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/filter_chain.cc
diff --git a/mojo/public/cpp/bindings/lib/filter_chain.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/filter_chain.h
index bd7f9f5..bd7f9f5 100644
--- a/mojo/public/cpp/bindings/lib/filter_chain.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/filter_chain.h
diff --git a/mojo/public/cpp/bindings/lib/fixed_buffer.cc b/third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.cc
index 980abc3..980abc3 100644
--- a/mojo/public/cpp/bindings/lib/fixed_buffer.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.cc
diff --git a/mojo/public/cpp/bindings/lib/fixed_buffer.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.h
index c6cf34e..c6cf34e 100644
--- a/mojo/public/cpp/bindings/lib/fixed_buffer.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/fixed_buffer.h
diff --git a/mojo/public/cpp/bindings/lib/interface_ptr_internal.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h
index a38baf7..a38baf7 100644
--- a/mojo/public/cpp/bindings/lib/interface_ptr_internal.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h
diff --git a/mojo/public/cpp/bindings/lib/map_data_internal.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/map_data_internal.h
index 7787714..7787714 100644
--- a/mojo/public/cpp/bindings/lib/map_data_internal.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/map_data_internal.h
diff --git a/mojo/public/cpp/bindings/lib/map_internal.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/map_internal.h
index f006cd0..f006cd0 100644
--- a/mojo/public/cpp/bindings/lib/map_internal.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/map_internal.h
diff --git a/mojo/public/cpp/bindings/lib/map_serialization.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/map_serialization.h
index fba8165..fba8165 100644
--- a/mojo/public/cpp/bindings/lib/map_serialization.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/map_serialization.h
diff --git a/mojo/public/cpp/bindings/lib/message.cc b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message.cc
index 2723bcb..2723bcb 100644
--- a/mojo/public/cpp/bindings/lib/message.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message.cc
diff --git a/mojo/public/cpp/bindings/lib/message_builder.cc b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.cc
index cc914e8..cc914e8 100644
--- a/mojo/public/cpp/bindings/lib/message_builder.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.cc
diff --git a/mojo/public/cpp/bindings/lib/message_builder.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.h
index a10940c..a10940c 100644
--- a/mojo/public/cpp/bindings/lib/message_builder.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_builder.h
diff --git a/mojo/public/cpp/bindings/lib/message_filter.cc b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_filter.cc
index b09f40d..b09f40d 100644
--- a/mojo/public/cpp/bindings/lib/message_filter.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_filter.cc
diff --git a/mojo/public/cpp/bindings/lib/message_header_validator.cc b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_header_validator.cc
index 9d28ecc..9d28ecc 100644
--- a/mojo/public/cpp/bindings/lib/message_header_validator.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_header_validator.cc
diff --git a/mojo/public/cpp/bindings/lib/message_header_validator.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_header_validator.h
index bccef1f..bccef1f 100644
--- a/mojo/public/cpp/bindings/lib/message_header_validator.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_header_validator.h
diff --git a/mojo/public/cpp/bindings/lib/message_internal.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_internal.h
index cdecf91..cdecf91 100644
--- a/mojo/public/cpp/bindings/lib/message_internal.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_internal.h
diff --git a/mojo/public/cpp/bindings/lib/message_queue.cc b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_queue.cc
index fd701e97..fd701e97 100644
--- a/mojo/public/cpp/bindings/lib/message_queue.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_queue.cc
diff --git a/mojo/public/cpp/bindings/lib/message_queue.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_queue.h
index 4e46b54..4e46b54 100644
--- a/mojo/public/cpp/bindings/lib/message_queue.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/message_queue.h
diff --git a/mojo/public/cpp/bindings/lib/no_interface.cc b/third_party/mojo/src/mojo/public/cpp/bindings/lib/no_interface.cc
index 9e0945c..9e0945c 100644
--- a/mojo/public/cpp/bindings/lib/no_interface.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/no_interface.cc
diff --git a/mojo/public/cpp/bindings/lib/router.cc b/third_party/mojo/src/mojo/public/cpp/bindings/lib/router.cc
index bb29e47..bb29e47 100644
--- a/mojo/public/cpp/bindings/lib/router.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/router.cc
diff --git a/mojo/public/cpp/bindings/lib/router.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/router.h
index 8254bab..8254bab 100644
--- a/mojo/public/cpp/bindings/lib/router.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/router.h
diff --git a/mojo/public/cpp/bindings/lib/shared_data.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/shared_data.h
index 54c9346..54c9346 100644
--- a/mojo/public/cpp/bindings/lib/shared_data.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/shared_data.h
diff --git a/mojo/public/cpp/bindings/lib/shared_ptr.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/shared_ptr.h
index 37c8735..37c8735 100644
--- a/mojo/public/cpp/bindings/lib/shared_ptr.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/shared_ptr.h
diff --git a/mojo/public/cpp/bindings/lib/string_serialization.cc b/third_party/mojo/src/mojo/public/cpp/bindings/lib/string_serialization.cc
index e29d6f8..e29d6f8 100644
--- a/mojo/public/cpp/bindings/lib/string_serialization.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/string_serialization.cc
diff --git a/mojo/public/cpp/bindings/lib/string_serialization.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/string_serialization.h
index 0118742..0118742 100644
--- a/mojo/public/cpp/bindings/lib/string_serialization.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/string_serialization.h
diff --git a/mojo/public/cpp/bindings/lib/template_util.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h
index c221a54..c221a54 100644
--- a/mojo/public/cpp/bindings/lib/template_util.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h
diff --git a/mojo/public/cpp/bindings/lib/union_accessor.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/union_accessor.h
index 821aede..821aede 100644
--- a/mojo/public/cpp/bindings/lib/union_accessor.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/union_accessor.h
diff --git a/mojo/public/cpp/bindings/lib/validate_params.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/validate_params.h
index 25bd98c..25bd98c 100644
--- a/mojo/public/cpp/bindings/lib/validate_params.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/validate_params.h
diff --git a/mojo/public/cpp/bindings/lib/validation_errors.cc b/third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.cc
index b065d90..b065d90 100644
--- a/mojo/public/cpp/bindings/lib/validation_errors.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.cc
diff --git a/mojo/public/cpp/bindings/lib/validation_errors.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.h
index 2abb1b7..2abb1b7 100644
--- a/mojo/public/cpp/bindings/lib/validation_errors.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/validation_errors.h
diff --git a/mojo/public/cpp/bindings/map.h b/third_party/mojo/src/mojo/public/cpp/bindings/map.h
index 5149bb0..5149bb0 100644
--- a/mojo/public/cpp/bindings/map.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/map.h
diff --git a/mojo/public/cpp/bindings/message.h b/third_party/mojo/src/mojo/public/cpp/bindings/message.h
index 5cab4ea..5cab4ea 100644
--- a/mojo/public/cpp/bindings/message.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/message.h
diff --git a/mojo/public/cpp/bindings/message_filter.h b/third_party/mojo/src/mojo/public/cpp/bindings/message_filter.h
index 12885b0..12885b0 100644
--- a/mojo/public/cpp/bindings/message_filter.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/message_filter.h
diff --git a/mojo/public/cpp/bindings/no_interface.h b/third_party/mojo/src/mojo/public/cpp/bindings/no_interface.h
index 4c35789..4c35789 100644
--- a/mojo/public/cpp/bindings/no_interface.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/no_interface.h
diff --git a/mojo/public/cpp/bindings/string.h b/third_party/mojo/src/mojo/public/cpp/bindings/string.h
index ba0d8fa8..ba0d8fa8 100644
--- a/mojo/public/cpp/bindings/string.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/string.h
diff --git a/mojo/public/cpp/bindings/strong_binding.h b/third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h
index 0cd4f03..0cd4f03 100644
--- a/mojo/public/cpp/bindings/strong_binding.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h
diff --git a/mojo/public/cpp/bindings/struct_ptr.h b/third_party/mojo/src/mojo/public/cpp/bindings/struct_ptr.h
index a420fa5..a420fa5 100644
--- a/mojo/public/cpp/bindings/struct_ptr.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/struct_ptr.h
diff --git a/mojo/public/cpp/bindings/tests/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/bindings/tests/BUILD.gn
index 0051270..0051270 100644
--- a/mojo/public/cpp/bindings/tests/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/BUILD.gn
diff --git a/mojo/public/cpp/bindings/tests/DEPS b/third_party/mojo/src/mojo/public/cpp/bindings/tests/DEPS
index b99d520..b99d520 100644
--- a/mojo/public/cpp/bindings/tests/DEPS
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/DEPS
diff --git a/mojo/public/cpp/bindings/tests/array_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/array_unittest.cc
index ed9a647..ed9a647 100644
--- a/mojo/public/cpp/bindings/tests/array_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/array_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc
index 1cd9618..1cd9618 100644
--- a/mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/bounds_checker_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/buffer_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/buffer_unittest.cc
index 61424c05..61424c05 100644
--- a/mojo/public/cpp/bindings/tests/buffer_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/buffer_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/connector_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/connector_unittest.cc
index 3e00a67..3e00a67 100644
--- a/mojo/public/cpp/bindings/tests/connector_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/connector_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/container_test_util.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/container_test_util.cc
index e8377c4..e8377c4 100644
--- a/mojo/public/cpp/bindings/tests/container_test_util.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/container_test_util.cc
diff --git a/mojo/public/cpp/bindings/tests/container_test_util.h b/third_party/mojo/src/mojo/public/cpp/bindings/tests/container_test_util.h
index 1e29d22..1e29d22 100644
--- a/mojo/public/cpp/bindings/tests/container_test_util.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/container_test_util.h
diff --git a/mojo/public/cpp/bindings/tests/equals_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/equals_unittest.cc
index 9196d86..9196d86 100644
--- a/mojo/public/cpp/bindings/tests/equals_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/equals_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc
index 5667f64..5667f64 100644
--- a/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc
index f90dc3d..f90dc3d 100644
--- a/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/map_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/map_unittest.cc
index 698f407..698f407 100644
--- a/mojo/public/cpp/bindings/tests/map_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/map_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/request_response_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/request_response_unittest.cc
index 4864e35..4864e35 100644
--- a/mojo/public/cpp/bindings/tests/request_response_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/request_response_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/router_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/router_unittest.cc
index c4efdb0..c4efdb0 100644
--- a/mojo/public/cpp/bindings/tests/router_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/router_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/sample_service_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/sample_service_unittest.cc
index ff047cb..ff047cb 100644
--- a/mojo/public/cpp/bindings/tests/sample_service_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/sample_service_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc
index 4359be8..4359be8 100644
--- a/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/serialization_warning_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/string_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/string_unittest.cc
index 7e3d910..7e3d910 100644
--- a/mojo/public/cpp/bindings/tests/string_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/string_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/struct_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/struct_unittest.cc
index 52d1313..52d1313 100644
--- a/mojo/public/cpp/bindings/tests/struct_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/struct_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc
index 776ac14..776ac14 100644
--- a/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/type_conversion_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/union_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/union_unittest.cc
index a8d8a95..a8d8a95 100644
--- a/mojo/public/cpp/bindings/tests/union_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/union_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/validation_test_input_parser.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_test_input_parser.cc
index 9d2607d..9d2607d 100644
--- a/mojo/public/cpp/bindings/tests/validation_test_input_parser.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_test_input_parser.cc
diff --git a/mojo/public/cpp/bindings/tests/validation_test_input_parser.h b/third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_test_input_parser.h
index c8821cd..c8821cd 100644
--- a/mojo/public/cpp/bindings/tests/validation_test_input_parser.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_test_input_parser.h
diff --git a/mojo/public/cpp/bindings/tests/validation_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_unittest.cc
index 6507f21..6507f21 100644
--- a/mojo/public/cpp/bindings/tests/validation_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/validation_unittest.cc
diff --git a/mojo/public/cpp/bindings/type_converter.h b/third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h
index ff94cda..ff94cda 100644
--- a/mojo/public/cpp/bindings/type_converter.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/type_converter.h
diff --git a/mojo/public/cpp/environment/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/environment/BUILD.gn
index 87f24ff..87f24ff 100644
--- a/mojo/public/cpp/environment/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/cpp/environment/BUILD.gn
diff --git a/mojo/public/cpp/environment/DEPS b/third_party/mojo/src/mojo/public/cpp/environment/DEPS
index 04346d9..04346d9 100644
--- a/mojo/public/cpp/environment/DEPS
+++ b/third_party/mojo/src/mojo/public/cpp/environment/DEPS
diff --git a/mojo/public/cpp/environment/async_waiter.h b/third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h
index 83b7c8a..83b7c8a 100644
--- a/mojo/public/cpp/environment/async_waiter.h
+++ b/third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h
diff --git a/mojo/public/cpp/environment/environment.h b/third_party/mojo/src/mojo/public/cpp/environment/environment.h
index ce3f7d0..ce3f7d0 100644
--- a/mojo/public/cpp/environment/environment.h
+++ b/third_party/mojo/src/mojo/public/cpp/environment/environment.h
diff --git a/mojo/public/cpp/environment/lib/DEPS b/third_party/mojo/src/mojo/public/cpp/environment/lib/DEPS
index 1889e1f..1889e1f 100644
--- a/mojo/public/cpp/environment/lib/DEPS
+++ b/third_party/mojo/src/mojo/public/cpp/environment/lib/DEPS
diff --git a/mojo/public/cpp/environment/lib/async_waiter.cc b/third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc
index 599a649..599a649 100644
--- a/mojo/public/cpp/environment/lib/async_waiter.cc
+++ b/third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc
diff --git a/mojo/public/cpp/environment/lib/default_async_waiter.cc b/third_party/mojo/src/mojo/public/cpp/environment/lib/default_async_waiter.cc
index 4a588a9..4a588a9 100644
--- a/mojo/public/cpp/environment/lib/default_async_waiter.cc
+++ b/third_party/mojo/src/mojo/public/cpp/environment/lib/default_async_waiter.cc
diff --git a/mojo/public/cpp/environment/lib/default_async_waiter.h b/third_party/mojo/src/mojo/public/cpp/environment/lib/default_async_waiter.h
index 49ce233..49ce233 100644
--- a/mojo/public/cpp/environment/lib/default_async_waiter.h
+++ b/third_party/mojo/src/mojo/public/cpp/environment/lib/default_async_waiter.h
diff --git a/mojo/public/cpp/environment/lib/default_logger.cc b/third_party/mojo/src/mojo/public/cpp/environment/lib/default_logger.cc
index 05cafbd..05cafbd 100644
--- a/mojo/public/cpp/environment/lib/default_logger.cc
+++ b/third_party/mojo/src/mojo/public/cpp/environment/lib/default_logger.cc
diff --git a/mojo/public/cpp/environment/lib/default_logger.h b/third_party/mojo/src/mojo/public/cpp/environment/lib/default_logger.h
index 4db3233..4db3233 100644
--- a/mojo/public/cpp/environment/lib/default_logger.h
+++ b/third_party/mojo/src/mojo/public/cpp/environment/lib/default_logger.h
diff --git a/mojo/public/cpp/environment/lib/environment.cc b/third_party/mojo/src/mojo/public/cpp/environment/lib/environment.cc
index 6fb7e22..6fb7e22 100644
--- a/mojo/public/cpp/environment/lib/environment.cc
+++ b/third_party/mojo/src/mojo/public/cpp/environment/lib/environment.cc
diff --git a/mojo/public/cpp/environment/lib/logging.cc b/third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc
index 990626d..990626d 100644
--- a/mojo/public/cpp/environment/lib/logging.cc
+++ b/third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc
diff --git a/mojo/public/cpp/environment/logging.h b/third_party/mojo/src/mojo/public/cpp/environment/logging.h
index 5df18fb..5df18fb 100644
--- a/mojo/public/cpp/environment/logging.h
+++ b/third_party/mojo/src/mojo/public/cpp/environment/logging.h
diff --git a/mojo/public/cpp/environment/tests/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/environment/tests/BUILD.gn
index 10fd056..10fd056 100644
--- a/mojo/public/cpp/environment/tests/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/cpp/environment/tests/BUILD.gn
diff --git a/mojo/public/cpp/environment/tests/async_wait_unittest.cc b/third_party/mojo/src/mojo/public/cpp/environment/tests/async_wait_unittest.cc
index 83c5ca0..83c5ca0 100644
--- a/mojo/public/cpp/environment/tests/async_wait_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/environment/tests/async_wait_unittest.cc
diff --git a/mojo/public/cpp/environment/tests/async_waiter_unittest.cc b/third_party/mojo/src/mojo/public/cpp/environment/tests/async_waiter_unittest.cc
index 1c1c2bf..1c1c2bf 100644
--- a/mojo/public/cpp/environment/tests/async_waiter_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/environment/tests/async_waiter_unittest.cc
diff --git a/mojo/public/cpp/environment/tests/logger_unittest.cc b/third_party/mojo/src/mojo/public/cpp/environment/tests/logger_unittest.cc
index 7aef2ee..7aef2ee 100644
--- a/mojo/public/cpp/environment/tests/logger_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/environment/tests/logger_unittest.cc
diff --git a/mojo/public/cpp/environment/tests/logging_unittest.cc b/third_party/mojo/src/mojo/public/cpp/environment/tests/logging_unittest.cc
index 53a1f88..53a1f88 100644
--- a/mojo/public/cpp/environment/tests/logging_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/environment/tests/logging_unittest.cc
diff --git a/mojo/public/cpp/system/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/system/BUILD.gn
index e120462..e120462 100644
--- a/mojo/public/cpp/system/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/cpp/system/BUILD.gn
diff --git a/mojo/public/cpp/system/buffer.h b/third_party/mojo/src/mojo/public/cpp/system/buffer.h
index 6817297..6817297 100644
--- a/mojo/public/cpp/system/buffer.h
+++ b/third_party/mojo/src/mojo/public/cpp/system/buffer.h
diff --git a/mojo/public/cpp/system/core.h b/third_party/mojo/src/mojo/public/cpp/system/core.h
index b08a5a6..b08a5a6 100644
--- a/mojo/public/cpp/system/core.h
+++ b/third_party/mojo/src/mojo/public/cpp/system/core.h
diff --git a/mojo/public/cpp/system/data_pipe.h b/third_party/mojo/src/mojo/public/cpp/system/data_pipe.h
index 5d3396c..5d3396c 100644
--- a/mojo/public/cpp/system/data_pipe.h
+++ b/third_party/mojo/src/mojo/public/cpp/system/data_pipe.h
diff --git a/mojo/public/cpp/system/functions.h b/third_party/mojo/src/mojo/public/cpp/system/functions.h
index d73d27a..d73d27a 100644
--- a/mojo/public/cpp/system/functions.h
+++ b/third_party/mojo/src/mojo/public/cpp/system/functions.h
diff --git a/mojo/public/cpp/system/handle.h b/third_party/mojo/src/mojo/public/cpp/system/handle.h
index 0c5adc7..0c5adc7 100644
--- a/mojo/public/cpp/system/handle.h
+++ b/third_party/mojo/src/mojo/public/cpp/system/handle.h
diff --git a/mojo/public/cpp/system/macros.h b/third_party/mojo/src/mojo/public/cpp/system/macros.h
index f2bd0bc..f2bd0bc 100644
--- a/mojo/public/cpp/system/macros.h
+++ b/third_party/mojo/src/mojo/public/cpp/system/macros.h
diff --git a/mojo/public/cpp/system/message_pipe.h b/third_party/mojo/src/mojo/public/cpp/system/message_pipe.h
index b41469e..b41469e 100644
--- a/mojo/public/cpp/system/message_pipe.h
+++ b/third_party/mojo/src/mojo/public/cpp/system/message_pipe.h
diff --git a/mojo/public/cpp/system/tests/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/system/tests/BUILD.gn
index 7a5b7ed..7a5b7ed 100644
--- a/mojo/public/cpp/system/tests/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/cpp/system/tests/BUILD.gn
diff --git a/mojo/public/cpp/system/tests/core_unittest.cc b/third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest.cc
index 4dcad43..4dcad43 100644
--- a/mojo/public/cpp/system/tests/core_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest.cc
diff --git a/mojo/public/cpp/system/tests/macros_unittest.cc b/third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc
index 27a61bd..27a61bd 100644
--- a/mojo/public/cpp/system/tests/macros_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittest.cc
diff --git a/mojo/public/cpp/test_support/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/test_support/BUILD.gn
index a1f7d31..a1f7d31 100644
--- a/mojo/public/cpp/test_support/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/cpp/test_support/BUILD.gn
diff --git a/mojo/public/cpp/test_support/DEPS b/third_party/mojo/src/mojo/public/cpp/test_support/DEPS
index 6dc5394..6dc5394 100644
--- a/mojo/public/cpp/test_support/DEPS
+++ b/third_party/mojo/src/mojo/public/cpp/test_support/DEPS
diff --git a/mojo/public/cpp/test_support/lib/test_support.cc b/third_party/mojo/src/mojo/public/cpp/test_support/lib/test_support.cc
index 0b6035b..0b6035b 100644
--- a/mojo/public/cpp/test_support/lib/test_support.cc
+++ b/third_party/mojo/src/mojo/public/cpp/test_support/lib/test_support.cc
diff --git a/mojo/public/cpp/test_support/lib/test_utils.cc b/third_party/mojo/src/mojo/public/cpp/test_support/lib/test_utils.cc
index 210c6b1..210c6b1 100644
--- a/mojo/public/cpp/test_support/lib/test_utils.cc
+++ b/third_party/mojo/src/mojo/public/cpp/test_support/lib/test_utils.cc
diff --git a/mojo/public/cpp/test_support/test_support.h b/third_party/mojo/src/mojo/public/cpp/test_support/test_support.h
index 9a536e6..9a536e6 100644
--- a/mojo/public/cpp/test_support/test_support.h
+++ b/third_party/mojo/src/mojo/public/cpp/test_support/test_support.h
diff --git a/mojo/public/cpp/test_support/test_utils.h b/third_party/mojo/src/mojo/public/cpp/test_support/test_utils.h
index 6fd5a9e..6fd5a9e 100644
--- a/mojo/public/cpp/test_support/test_utils.h
+++ b/third_party/mojo/src/mojo/public/cpp/test_support/test_utils.h
diff --git a/mojo/public/cpp/utility/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/utility/BUILD.gn
index 9660a07..9660a07 100644
--- a/mojo/public/cpp/utility/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/cpp/utility/BUILD.gn
diff --git a/mojo/public/cpp/utility/DEPS b/third_party/mojo/src/mojo/public/cpp/utility/DEPS
index a9dfbd1..a9dfbd1 100644
--- a/mojo/public/cpp/utility/DEPS
+++ b/third_party/mojo/src/mojo/public/cpp/utility/DEPS
diff --git a/mojo/public/cpp/utility/lib/mutex.cc b/third_party/mojo/src/mojo/public/cpp/utility/lib/mutex.cc
index 23370e1..23370e1 100644
--- a/mojo/public/cpp/utility/lib/mutex.cc
+++ b/third_party/mojo/src/mojo/public/cpp/utility/lib/mutex.cc
diff --git a/mojo/public/cpp/utility/lib/run_loop.cc b/third_party/mojo/src/mojo/public/cpp/utility/lib/run_loop.cc
index 7faf748..7faf748 100644
--- a/mojo/public/cpp/utility/lib/run_loop.cc
+++ b/third_party/mojo/src/mojo/public/cpp/utility/lib/run_loop.cc
diff --git a/mojo/public/cpp/utility/lib/thread.cc b/third_party/mojo/src/mojo/public/cpp/utility/lib/thread.cc
index 40f0bdd..40f0bdd 100644
--- a/mojo/public/cpp/utility/lib/thread.cc
+++ b/third_party/mojo/src/mojo/public/cpp/utility/lib/thread.cc
diff --git a/mojo/public/cpp/utility/lib/thread_local.h b/third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local.h
index f5461ee..f5461ee 100644
--- a/mojo/public/cpp/utility/lib/thread_local.h
+++ b/third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local.h
diff --git a/mojo/public/cpp/utility/lib/thread_local_posix.cc b/third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local_posix.cc
index ea7343e..ea7343e 100644
--- a/mojo/public/cpp/utility/lib/thread_local_posix.cc
+++ b/third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local_posix.cc
diff --git a/mojo/public/cpp/utility/lib/thread_local_win.cc b/third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local_win.cc
index 98841f7..98841f7 100644
--- a/mojo/public/cpp/utility/lib/thread_local_win.cc
+++ b/third_party/mojo/src/mojo/public/cpp/utility/lib/thread_local_win.cc
diff --git a/mojo/public/cpp/utility/mutex.h b/third_party/mojo/src/mojo/public/cpp/utility/mutex.h
index 4dc4aee..4dc4aee 100644
--- a/mojo/public/cpp/utility/mutex.h
+++ b/third_party/mojo/src/mojo/public/cpp/utility/mutex.h
diff --git a/mojo/public/cpp/utility/run_loop.h b/third_party/mojo/src/mojo/public/cpp/utility/run_loop.h
index 5ebe63e..5ebe63e 100644
--- a/mojo/public/cpp/utility/run_loop.h
+++ b/third_party/mojo/src/mojo/public/cpp/utility/run_loop.h
diff --git a/mojo/public/cpp/utility/run_loop_handler.h b/third_party/mojo/src/mojo/public/cpp/utility/run_loop_handler.h
index 69838d5..69838d5 100644
--- a/mojo/public/cpp/utility/run_loop_handler.h
+++ b/third_party/mojo/src/mojo/public/cpp/utility/run_loop_handler.h
diff --git a/mojo/public/cpp/utility/tests/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/utility/tests/BUILD.gn
index a8a96c1..a8a96c1 100644
--- a/mojo/public/cpp/utility/tests/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/cpp/utility/tests/BUILD.gn
diff --git a/mojo/public/cpp/utility/tests/mutex_unittest.cc b/third_party/mojo/src/mojo/public/cpp/utility/tests/mutex_unittest.cc
index 78e95c5..78e95c5 100644
--- a/mojo/public/cpp/utility/tests/mutex_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/utility/tests/mutex_unittest.cc
diff --git a/mojo/public/cpp/utility/tests/run_loop_unittest.cc b/third_party/mojo/src/mojo/public/cpp/utility/tests/run_loop_unittest.cc
index 4ab4876..4ab4876 100644
--- a/mojo/public/cpp/utility/tests/run_loop_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/utility/tests/run_loop_unittest.cc
diff --git a/mojo/public/cpp/utility/tests/thread_unittest.cc b/third_party/mojo/src/mojo/public/cpp/utility/tests/thread_unittest.cc
index 57c4ad9..57c4ad9 100644
--- a/mojo/public/cpp/utility/tests/thread_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/utility/tests/thread_unittest.cc
diff --git a/mojo/public/cpp/utility/thread.h b/third_party/mojo/src/mojo/public/cpp/utility/thread.h
index b7d10ee..b7d10ee 100644
--- a/mojo/public/cpp/utility/thread.h
+++ b/third_party/mojo/src/mojo/public/cpp/utility/thread.h
diff --git a/mojo/public/dart/DEPS b/third_party/mojo/src/mojo/public/dart/DEPS
index 53d0007..53d0007 100644
--- a/mojo/public/dart/DEPS
+++ b/third_party/mojo/src/mojo/public/dart/DEPS
diff --git a/mojo/public/dart/README b/third_party/mojo/src/mojo/public/dart/README
index f9cd6e6..f9cd6e6 100644
--- a/mojo/public/dart/README
+++ b/third_party/mojo/src/mojo/public/dart/README
diff --git a/mojo/public/dart/bindings.dart b/third_party/mojo/src/mojo/public/dart/bindings.dart
index 5d6298e..5d6298e 100644
--- a/mojo/public/dart/bindings.dart
+++ b/third_party/mojo/src/mojo/public/dart/bindings.dart
diff --git a/mojo/public/dart/core.dart b/third_party/mojo/src/mojo/public/dart/core.dart
index e9fb716..e9fb716 100644
--- a/mojo/public/dart/core.dart
+++ b/third_party/mojo/src/mojo/public/dart/core.dart
diff --git a/mojo/public/dart/src/buffer.dart b/third_party/mojo/src/mojo/public/dart/src/buffer.dart
index 4467315..4467315 100644
--- a/mojo/public/dart/src/buffer.dart
+++ b/third_party/mojo/src/mojo/public/dart/src/buffer.dart
diff --git a/mojo/public/dart/src/client.dart b/third_party/mojo/src/mojo/public/dart/src/client.dart
index f8ec73c..f8ec73c 100644
--- a/mojo/public/dart/src/client.dart
+++ b/third_party/mojo/src/mojo/public/dart/src/client.dart
diff --git a/mojo/public/dart/src/codec.dart b/third_party/mojo/src/mojo/public/dart/src/codec.dart
index d5f5b90..d5f5b90 100644
--- a/mojo/public/dart/src/codec.dart
+++ b/third_party/mojo/src/mojo/public/dart/src/codec.dart
diff --git a/mojo/public/dart/src/data_pipe.dart b/third_party/mojo/src/mojo/public/dart/src/data_pipe.dart
index 7f3b3eb..7f3b3eb 100644
--- a/mojo/public/dart/src/data_pipe.dart
+++ b/third_party/mojo/src/mojo/public/dart/src/data_pipe.dart
diff --git a/mojo/public/dart/src/event_stream.dart b/third_party/mojo/src/mojo/public/dart/src/event_stream.dart
index 797f0e6..797f0e6 100644
--- a/mojo/public/dart/src/event_stream.dart
+++ b/third_party/mojo/src/mojo/public/dart/src/event_stream.dart
diff --git a/mojo/public/dart/src/handle.dart b/third_party/mojo/src/mojo/public/dart/src/handle.dart
index a819804..a819804 100644
--- a/mojo/public/dart/src/handle.dart
+++ b/third_party/mojo/src/mojo/public/dart/src/handle.dart
diff --git a/mojo/public/dart/src/handle_watcher.dart b/third_party/mojo/src/mojo/public/dart/src/handle_watcher.dart
index 3d14f6c..3d14f6c 100644
--- a/mojo/public/dart/src/handle_watcher.dart
+++ b/third_party/mojo/src/mojo/public/dart/src/handle_watcher.dart
diff --git a/mojo/public/dart/src/interface.dart b/third_party/mojo/src/mojo/public/dart/src/interface.dart
index 0e73214..0e73214 100644
--- a/mojo/public/dart/src/interface.dart
+++ b/third_party/mojo/src/mojo/public/dart/src/interface.dart
diff --git a/mojo/public/dart/src/message.dart b/third_party/mojo/src/mojo/public/dart/src/message.dart
index 2cdda8a..2cdda8a 100644
--- a/mojo/public/dart/src/message.dart
+++ b/third_party/mojo/src/mojo/public/dart/src/message.dart
diff --git a/mojo/public/dart/src/message_pipe.dart b/third_party/mojo/src/mojo/public/dart/src/message_pipe.dart
index 325be42..325be42 100644
--- a/mojo/public/dart/src/message_pipe.dart
+++ b/third_party/mojo/src/mojo/public/dart/src/message_pipe.dart
diff --git a/mojo/public/dart/src/struct.dart b/third_party/mojo/src/mojo/public/dart/src/struct.dart
index 0111732..0111732 100644
--- a/mojo/public/dart/src/struct.dart
+++ b/third_party/mojo/src/mojo/public/dart/src/struct.dart
diff --git a/mojo/public/dart/src/timer_impl.dart b/third_party/mojo/src/mojo/public/dart/src/timer_impl.dart
index 61fee6d..61fee6d 100644
--- a/mojo/public/dart/src/timer_impl.dart
+++ b/third_party/mojo/src/mojo/public/dart/src/timer_impl.dart
diff --git a/mojo/public/dart/src/timer_queue.dart b/third_party/mojo/src/mojo/public/dart/src/timer_queue.dart
index 8f9936b..8f9936b 100644
--- a/mojo/public/dart/src/timer_queue.dart
+++ b/third_party/mojo/src/mojo/public/dart/src/timer_queue.dart
diff --git a/mojo/public/dart/src/types.dart b/third_party/mojo/src/mojo/public/dart/src/types.dart
index 54c5319..54c5319 100644
--- a/mojo/public/dart/src/types.dart
+++ b/third_party/mojo/src/mojo/public/dart/src/types.dart
diff --git a/mojo/public/go/system/core.go b/third_party/mojo/src/mojo/public/go/system/core.go
index ff6ffc1..ff6ffc1 100644
--- a/mojo/public/go/system/core.go
+++ b/third_party/mojo/src/mojo/public/go/system/core.go
diff --git a/mojo/public/go/system/impl/core_impl.go b/third_party/mojo/src/mojo/public/go/system/impl/core_impl.go
index 2cce24f..2cce24f 100644
--- a/mojo/public/go/system/impl/core_impl.go
+++ b/third_party/mojo/src/mojo/public/go/system/impl/core_impl.go
diff --git a/mojo/public/go/system/impl/mojo_types.go b/third_party/mojo/src/mojo/public/go/system/impl/mojo_types.go
index 0218a33..0218a33 100644
--- a/mojo/public/go/system/impl/mojo_types.go
+++ b/third_party/mojo/src/mojo/public/go/system/impl/mojo_types.go
diff --git a/mojo/public/interfaces/application/BUILD.gn b/third_party/mojo/src/mojo/public/interfaces/application/BUILD.gn
index 463df55..463df55 100644
--- a/mojo/public/interfaces/application/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/interfaces/application/BUILD.gn
diff --git a/mojo/public/interfaces/application/application.mojom b/third_party/mojo/src/mojo/public/interfaces/application/application.mojom
index d389ae2..d389ae2 100644
--- a/mojo/public/interfaces/application/application.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/application/application.mojom
diff --git a/mojo/public/interfaces/application/service_provider.mojom b/third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom
index b862d35..b862d35 100644
--- a/mojo/public/interfaces/application/service_provider.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom
diff --git a/mojo/public/interfaces/application/shell.mojom b/third_party/mojo/src/mojo/public/interfaces/application/shell.mojom
index 1adf1e6..1adf1e6 100644
--- a/mojo/public/interfaces/application/shell.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/application/shell.mojom
diff --git a/mojo/public/interfaces/bindings/tests/BUILD.gn b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/BUILD.gn
index 2b99728..2b99728 100644
--- a/mojo/public/interfaces/bindings/tests/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/BUILD.gn
diff --git a/mojo/public/interfaces/bindings/tests/data/message_data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/message_data
index b288878..b288878 100644
--- a/mojo/public/interfaces/bindings/tests/data/message_data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/message_data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_empty.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_empty.data
index e69de29..e69de29 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_empty.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_empty.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_empty.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_empty.expected
index 779df88..779df88 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_empty.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_empty.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.data
index ee5ecdb..ee5ecdb 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.expected
index 779df88..779df88 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.data
index 21e7fbc..21e7fbc 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.expected
index 779df88..779df88 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_incomplete_struct_header.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flags.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flags.data
index 9d66188..9d66188 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flags.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flags.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flags.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flags.expected
index 696c78d..696c78d 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flags.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_invalid_flags.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.data
index 2414431..2414431 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.expected
index 083db1a..083db1a 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_missing_request_id.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.data
index ad3b005..ad3b005 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.expected
index 779df88..779df88 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_huge.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.data
index 353b4e8..353b4e8 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.expected
index 25aceee..25aceee 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_min_requirement.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.data
index 3a94448..3a94448 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.expected
index 25aceee..25aceee 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_less_than_struct_header.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_1.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_1.data
index 7e8a714..7e8a714 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_1.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_1.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_1.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_1.expected
index 25aceee..25aceee 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_1.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_1.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_2.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_2.data
index fd8b4b4..fd8b4b4 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_2.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_2.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_2.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_2.expected
index 25aceee..25aceee 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_2.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_2.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_3.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_3.data
index c4b46ab..c4b46ab 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_3.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_3.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_3.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_3.expected
index 25aceee..25aceee 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_3.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_bytes_num_fields_mismatch_3.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_fields_less_than_min_requirement.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_fields_less_than_min_requirement.data
index a94e6ce..a94e6ce 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_fields_less_than_min_requirement.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_fields_less_than_min_requirement.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_fields_less_than_min_requirement.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_fields_less_than_min_requirement.expected
index 25aceee..25aceee 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_fields_less_than_min_requirement.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_msghdr_num_fields_less_than_min_requirement.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.data
index 1a5603e..1a5603e 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.expected
index 7ef22e9..7ef22e9 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_good.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.data
index 5556808..5556808 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.expected
index 779df88..779df88 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.data
index 9a362f6..9a362f6 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.expected
index 779df88..779df88 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_incomplete_struct_header.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.data
index 52e4540..52e4540 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.expected
index 779df88..779df88 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_huge.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.data
index 7c966f8..7c966f8 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.expected
index 25aceee..25aceee 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_min_requirement.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.data
index af20941..af20941 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.expected
index 25aceee..25aceee 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd0_struct_num_bytes_less_than_struct_header.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.data
index 4ae4fd4..4ae4fd4 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.expected
index 7ef22e9..7ef22e9 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.data
index cc18fee..cc18fee 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.expected
index 7ef22e9..7ef22e9 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_good_non_unique_keys.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.data
index a296980..a296980 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.expected
index 95d8db0..95d8db0 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_keys.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.data
index ce135da..ce135da 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.expected
index 95d8db0..95d8db0 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_null_values.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.data
index 06b55fb..06b55fb 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.expected
index 95d8db0..95d8db0 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_one_null_key.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.data
index 15c76b3..15c76b3 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.expected
index 2798d48..2798d48 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd10_unequal_array_size.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.data
index d67a72f..d67a72f 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.expected
index 7ef22e9..7ef22e9 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_good.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.data
index 051dccc..051dccc 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.expected
index acca999..acca999 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_misaligned_struct.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.data
index 98a21c4d..98a21c4d 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.expected
index 23abb8c..23abb8c 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_struct_pointer_overflow.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.data
index c53a78b..c53a78b 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.expected
index 95d8db0..95d8db0 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd1_unexpected_null_struct.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.data
index 38e20ab..38e20ab 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.expected
index 7ef22e9..7ef22e9 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_good.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.data
index a12121b..a12121b 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.expected
index 779df88..779df88 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_multiple_pointers_to_same_struct.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.data
index a916f03..a916f03 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.expected
index 779df88..779df88 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_overlapped_objects.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.data
index 7145ccd..7145ccd 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.expected
index 779df88..779df88 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd2_wrong_layout_order.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.data
index ca7651a..ca7651a 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.expected
index 779df88..779df88 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_huge.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.data
index 9bc1fc3..9bc1fc3 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.expected
index 5a1ec4e..5a1ec4e 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_array_header.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.data
index bed891c..bed891c 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.expected
index 5a1ec4e..5a1ec4e 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_num_bytes_less_than_necessary_size.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.data
index f8d7644..f8d7644 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.expected
index 23abb8c..23abb8c 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_array_pointer_overflow.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.data
index cc7dd38..cc7dd38 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.expected
index 7ef22e9..7ef22e9 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_good.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.data
index 7850893..7850893 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.expected
index 779df88..779df88 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.data
index 5de9fe6..5de9fe6 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.expected
index 779df88..779df88 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_incomplete_array_header.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.data
index 40a13e0..40a13e0 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.expected
index acca999..acca999 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_misaligned_array.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.data
index 0edab4b..0edab4b 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.expected
index 95d8db0..95d8db0 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd3_unexpected_null_array.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.data
index 46f7502..46f7502 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.expected
index 7ef22e9..7ef22e9 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_good.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.data
index f3a0e9f..f3a0e9f 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.expected
index 779df88..779df88 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_multiple_pointers_to_same_array.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.data
index d819857..d819857 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.expected
index 779df88..779df88 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_overlapped_objects.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.data
index fdc925f..fdc925f 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.expected
index 779df88..779df88 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd4_wrong_layout_order.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.data
index 0518c14..0518c14 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.expected
index 7ef22e9..7ef22e9 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_good.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.data
index 43cad7c..43cad7c 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.expected
index eef8e38..eef8e38 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_handle_out_of_range.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.data
index 8b39c00..8b39c00 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.expected
index eef8e38..eef8e38 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_1.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.data
index 95a356b..95a356b 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.expected
index eef8e38..eef8e38 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_multiple_handles_with_same_value_2.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.data
index ef492851..ef492851 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.expected
index 6768236..6768236 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_unexpected_invalid_handle.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.data
index c6fa8ea..c6fa8ea 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.expected
index eef8e38..eef8e38 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd5_wrong_handle_order.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.data
index 4f34c0b..4f34c0b 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.expected
index 7ef22e9..7ef22e9 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_good.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.data
index a58396c..a58396c 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.expected
index 5a1ec4e..5a1ec4e 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd6_nested_array_num_bytes_less_than_necessary_size.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.data
index 9a983a7..9a983a7 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.expected
index 7ef22e9..7ef22e9 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_good.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.data
index b3adbc1..b3adbc1 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.expected
index 95d8db0..95d8db0 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unexpected_null_fixed_array.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.data
index 5be7deb..5be7deb 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.expected
index 5a1ec4e..5a1ec4e 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.data
index f1756dd..f1756dd 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.expected
index 5a1ec4e..5a1ec4e 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd7_unmatched_array_elements_nested.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.data
index 059e538..059e538 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.expected
index 5a1ec4e..5a1ec4e 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_array_num_bytes_overflow.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.data
index fd5e174..fd5e174 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.expected
index 7ef22e9..7ef22e9 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_good.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.data
index f1d8718..f1d8718 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.expected
index 95d8db0..95d8db0 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_array.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.data
index 104dddb..104dddb 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.expected
index 95d8db0..95d8db0 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd8_unexpected_null_string.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.data
index c548906..c548906 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.expected
index 7ef22e9..7ef22e9 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.data
index f0967d5..f0967d5 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.expected
index 7ef22e9..7ef22e9 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_good_null_array.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.data
index 9c8f478..9c8f478 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.expected
index 95d8db0..95d8db0 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/conformance_mthd9_unexpected_null_array.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/integration_intf1_mthd0_rqst_good.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf1_mthd0_rqst_good.data
index df7b7e8..df7b7e8 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/integration_intf1_mthd0_rqst_good.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf1_mthd0_rqst_good.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/integration_intf1_mthd0_rqst_good.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf1_mthd0_rqst_good.expected
index 7ef22e9..7ef22e9 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/integration_intf1_mthd0_rqst_good.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf1_mthd0_rqst_good.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/integration_intf1_mthd0_rqst_unexpected_struct_header.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf1_mthd0_rqst_unexpected_struct_header.data
index 3dcca9d..3dcca9d 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/integration_intf1_mthd0_rqst_unexpected_struct_header.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf1_mthd0_rqst_unexpected_struct_header.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/integration_intf1_mthd0_rqst_unexpected_struct_header.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf1_mthd0_rqst_unexpected_struct_header.expected
index 25aceee..25aceee 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/integration_intf1_mthd0_rqst_unexpected_struct_header.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf1_mthd0_rqst_unexpected_struct_header.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/integration_intf2_mthd0_resp_good.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf2_mthd0_resp_good.data
index f4b6c40..f4b6c40 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/integration_intf2_mthd0_resp_good.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf2_mthd0_resp_good.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/integration_intf2_mthd0_resp_good.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf2_mthd0_resp_good.expected
index 7ef22e9..7ef22e9 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/integration_intf2_mthd0_resp_good.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf2_mthd0_resp_good.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/integration_intf2_mthd0_resp_unexpected_array_header.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf2_mthd0_resp_unexpected_array_header.data
index a357013..a357013 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/integration_intf2_mthd0_resp_unexpected_array_header.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf2_mthd0_resp_unexpected_array_header.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/integration_intf2_mthd0_resp_unexpected_array_header.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf2_mthd0_resp_unexpected_array_header.expected
index 5a1ec4e..5a1ec4e 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/integration_intf2_mthd0_resp_unexpected_array_header.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_intf2_mthd0_resp_unexpected_array_header.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.data
index 6d2cb4e..6d2cb4e 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.expected
index 696c78d..696c78d 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/integration_msghdr_invalid_flags.expected
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/not_implemented_mthd0_struct_num_fields_less_than_min_requirement.data b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/not_implemented_mthd0_struct_num_fields_less_than_min_requirement.data
index ffcafd3..ffcafd3 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/not_implemented_mthd0_struct_num_fields_less_than_min_requirement.data
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/not_implemented_mthd0_struct_num_fields_less_than_min_requirement.data
diff --git a/mojo/public/interfaces/bindings/tests/data/validation/not_implemented_mthd0_struct_num_fields_less_than_min_requirement.expected b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/not_implemented_mthd0_struct_num_fields_less_than_min_requirement.expected
index 25aceee..25aceee 100644
--- a/mojo/public/interfaces/bindings/tests/data/validation/not_implemented_mthd0_struct_num_fields_less_than_min_requirement.expected
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/data/validation/not_implemented_mthd0_struct_num_fields_less_than_min_requirement.expected
diff --git a/mojo/public/interfaces/bindings/tests/math_calculator.mojom b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/math_calculator.mojom
index f99bb07..f99bb07 100644
--- a/mojo/public/interfaces/bindings/tests/math_calculator.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/math_calculator.mojom
diff --git a/mojo/public/interfaces/bindings/tests/no_module.mojom b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/no_module.mojom
index f380011..f380011 100644
--- a/mojo/public/interfaces/bindings/tests/no_module.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/no_module.mojom
diff --git a/mojo/public/interfaces/bindings/tests/rect.mojom b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/rect.mojom
index b8cc977..b8cc977 100644
--- a/mojo/public/interfaces/bindings/tests/rect.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/rect.mojom
diff --git a/mojo/public/interfaces/bindings/tests/regression_tests.mojom b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/regression_tests.mojom
index 4a85b0a..4a85b0a 100644
--- a/mojo/public/interfaces/bindings/tests/regression_tests.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/regression_tests.mojom
diff --git a/mojo/public/interfaces/bindings/tests/regression_tests_import.mojom b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/regression_tests_import.mojom
index fbed983..fbed983 100644
--- a/mojo/public/interfaces/bindings/tests/regression_tests_import.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/regression_tests_import.mojom
diff --git a/mojo/public/interfaces/bindings/tests/sample_factory.mojom b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_factory.mojom
index eb5d930..eb5d930 100644
--- a/mojo/public/interfaces/bindings/tests/sample_factory.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_factory.mojom
diff --git a/mojo/public/interfaces/bindings/tests/sample_import.mojom b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_import.mojom
index d28cb7b..d28cb7b 100644
--- a/mojo/public/interfaces/bindings/tests/sample_import.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_import.mojom
diff --git a/mojo/public/interfaces/bindings/tests/sample_import2.mojom b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_import2.mojom
index 29065fc..29065fc 100644
--- a/mojo/public/interfaces/bindings/tests/sample_import2.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_import2.mojom
diff --git a/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom
index 37405ca..37405ca 100644
--- a/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom
diff --git a/mojo/public/interfaces/bindings/tests/sample_service.mojom b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_service.mojom
index 5c80781..5c80781 100644
--- a/mojo/public/interfaces/bindings/tests/sample_service.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/sample_service.mojom
diff --git a/mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom
index 1239e16..1239e16 100644
--- a/mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom
diff --git a/mojo/public/interfaces/bindings/tests/test_structs.mojom b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_structs.mojom
index 40fa9a6..40fa9a6 100644
--- a/mojo/public/interfaces/bindings/tests/test_structs.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_structs.mojom
diff --git a/mojo/public/interfaces/bindings/tests/test_unions.mojom b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_unions.mojom
index 5f50ccd..5f50ccd 100644
--- a/mojo/public/interfaces/bindings/tests/test_unions.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/test_unions.mojom
diff --git a/mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom
index 290b792..290b792 100644
--- a/mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom
+++ b/third_party/mojo/src/mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom
diff --git a/mojo/public/java/BUILD.gn b/third_party/mojo/src/mojo/public/java/BUILD.gn
index 04d2ef6..04d2ef6 100644
--- a/mojo/public/java/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/java/BUILD.gn
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/AutoCloseableRouter.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/AutoCloseableRouter.java
index 8a83be9..8a83be9 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/AutoCloseableRouter.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/AutoCloseableRouter.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/BindingsHelper.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/BindingsHelper.java
index 01cddc4..01cddc4 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/BindingsHelper.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/BindingsHelper.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Callbacks.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Callbacks.java
index c6b14c1..c6b14c1 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Callbacks.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Callbacks.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ConnectionErrorHandler.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ConnectionErrorHandler.java
index abb0bdf..abb0bdf 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ConnectionErrorHandler.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ConnectionErrorHandler.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Connector.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Connector.java
index cbb1924..cbb1924 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Connector.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Connector.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Decoder.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Decoder.java
index b95b6dd..b95b6dd 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Decoder.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Decoder.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DelegatingConnectionErrorHandler.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DelegatingConnectionErrorHandler.java
index 2ee2ae7..2ee2ae7 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DelegatingConnectionErrorHandler.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DelegatingConnectionErrorHandler.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DeserializationException.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DeserializationException.java
index eeb511c..eeb511c 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DeserializationException.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/DeserializationException.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java
index 75cddc9..75cddc9 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Encoder.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ExecutorFactory.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ExecutorFactory.java
index d0d5c3b..d0d5c3b 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ExecutorFactory.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ExecutorFactory.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/HandleOwner.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/HandleOwner.java
index 60fc33ba..60fc33ba 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/HandleOwner.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/HandleOwner.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Interface.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Interface.java
index c3b26a2..c3b26a2 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Interface.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Interface.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceRequest.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceRequest.java
index 87835e0..87835e0 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceRequest.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceRequest.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceWithClient.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceWithClient.java
index f7d8afe..f7d8afe 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceWithClient.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/InterfaceWithClient.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Message.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Message.java
index 0d270cc..0d270cc 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Message.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Message.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageHeader.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageHeader.java
index dcaf86c..dcaf86c 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageHeader.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageHeader.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiver.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiver.java
index 4223297..4223297 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiver.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiver.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiverWithResponder.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiverWithResponder.java
index e24a558..e24a558 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiverWithResponder.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageReceiverWithResponder.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Router.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Router.java
index ba19ae5..ba19ae5 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Router.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Router.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/RouterImpl.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/RouterImpl.java
index 5b27d7e..5b27d7e 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/RouterImpl.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/RouterImpl.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/SerializationException.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/SerializationException.java
index d4f5502..d4f5502 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/SerializationException.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/SerializationException.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ServiceMessage.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ServiceMessage.java
index 313dc6a..313dc6a 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ServiceMessage.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/ServiceMessage.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/SideEffectFreeCloseable.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/SideEffectFreeCloseable.java
index 118c991..118c991 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/SideEffectFreeCloseable.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/SideEffectFreeCloseable.java
diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Struct.java b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Struct.java
index 017d0ef..017d0ef 100644
--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Struct.java
+++ b/third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/Struct.java
diff --git a/mojo/public/java/system/src/org/chromium/mojo/system/AsyncWaiter.java b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/AsyncWaiter.java
index 474de4b..474de4b 100644
--- a/mojo/public/java/system/src/org/chromium/mojo/system/AsyncWaiter.java
+++ b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/AsyncWaiter.java
diff --git a/mojo/public/java/system/src/org/chromium/mojo/system/Core.java b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/Core.java
index 660a13f..660a13f 100644
--- a/mojo/public/java/system/src/org/chromium/mojo/system/Core.java
+++ b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/Core.java
diff --git a/mojo/public/java/system/src/org/chromium/mojo/system/DataPipe.java b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/DataPipe.java
index a5b77ae..a5b77ae 100644
--- a/mojo/public/java/system/src/org/chromium/mojo/system/DataPipe.java
+++ b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/DataPipe.java
diff --git a/mojo/public/java/system/src/org/chromium/mojo/system/Flags.java b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/Flags.java
index 30ff07f..30ff07f 100644
--- a/mojo/public/java/system/src/org/chromium/mojo/system/Flags.java
+++ b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/Flags.java
diff --git a/mojo/public/java/system/src/org/chromium/mojo/system/Handle.java b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/Handle.java
index 6181669..6181669 100644
--- a/mojo/public/java/system/src/org/chromium/mojo/system/Handle.java
+++ b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/Handle.java
diff --git a/mojo/public/java/system/src/org/chromium/mojo/system/InvalidHandle.java b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/InvalidHandle.java
index d92da7e..d92da7e 100644
--- a/mojo/public/java/system/src/org/chromium/mojo/system/InvalidHandle.java
+++ b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/InvalidHandle.java
diff --git a/mojo/public/java/system/src/org/chromium/mojo/system/MessagePipeHandle.java b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/MessagePipeHandle.java
index 60ac682..60ac682 100644
--- a/mojo/public/java/system/src/org/chromium/mojo/system/MessagePipeHandle.java
+++ b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/MessagePipeHandle.java
diff --git a/mojo/public/java/system/src/org/chromium/mojo/system/MojoException.java b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/MojoException.java
index e06f647..e06f647 100644
--- a/mojo/public/java/system/src/org/chromium/mojo/system/MojoException.java
+++ b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/MojoException.java
diff --git a/mojo/public/java/system/src/org/chromium/mojo/system/MojoResult.java b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/MojoResult.java
index a829c833..a829c833 100644
--- a/mojo/public/java/system/src/org/chromium/mojo/system/MojoResult.java
+++ b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/MojoResult.java
diff --git a/mojo/public/java/system/src/org/chromium/mojo/system/Pair.java b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/Pair.java
index 2ead020..2ead020 100644
--- a/mojo/public/java/system/src/org/chromium/mojo/system/Pair.java
+++ b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/Pair.java
diff --git a/mojo/public/java/system/src/org/chromium/mojo/system/SharedBufferHandle.java b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/SharedBufferHandle.java
index df317d1..df317d1 100644
--- a/mojo/public/java/system/src/org/chromium/mojo/system/SharedBufferHandle.java
+++ b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/SharedBufferHandle.java
diff --git a/mojo/public/java/system/src/org/chromium/mojo/system/UntypedHandle.java b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/UntypedHandle.java
index 199b0a1..199b0a1 100644
--- a/mojo/public/java/system/src/org/chromium/mojo/system/UntypedHandle.java
+++ b/third_party/mojo/src/mojo/public/java/system/src/org/chromium/mojo/system/UntypedHandle.java
diff --git a/mojo/public/js/BUILD.gn b/third_party/mojo/src/mojo/public/js/BUILD.gn
index 1cb1a60..1cb1a60 100644
--- a/mojo/public/js/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/js/BUILD.gn
diff --git a/mojo/public/js/bindings.js b/third_party/mojo/src/mojo/public/js/bindings.js
index 5f85860..5f85860 100644
--- a/mojo/public/js/bindings.js
+++ b/third_party/mojo/src/mojo/public/js/bindings.js
diff --git a/mojo/public/js/buffer.js b/third_party/mojo/src/mojo/public/js/buffer.js
index e35f695..e35f695 100644
--- a/mojo/public/js/buffer.js
+++ b/third_party/mojo/src/mojo/public/js/buffer.js
diff --git a/mojo/public/js/codec.js b/third_party/mojo/src/mojo/public/js/codec.js
index 357e507..357e507 100644
--- a/mojo/public/js/codec.js
+++ b/third_party/mojo/src/mojo/public/js/codec.js
diff --git a/mojo/public/js/codec_unittests.js b/third_party/mojo/src/mojo/public/js/codec_unittests.js
index 3d3ac9c..3d3ac9c 100644
--- a/mojo/public/js/codec_unittests.js
+++ b/third_party/mojo/src/mojo/public/js/codec_unittests.js
diff --git a/mojo/public/js/connection.js b/third_party/mojo/src/mojo/public/js/connection.js
index 3976efd..3976efd 100644
--- a/mojo/public/js/connection.js
+++ b/third_party/mojo/src/mojo/public/js/connection.js
diff --git a/mojo/public/js/connector.js b/third_party/mojo/src/mojo/public/js/connector.js
index 78ed963..78ed963 100644
--- a/mojo/public/js/connector.js
+++ b/third_party/mojo/src/mojo/public/js/connector.js
diff --git a/mojo/public/js/constants.cc b/third_party/mojo/src/mojo/public/js/constants.cc
index d29f5cb..d29f5cb 100644
--- a/mojo/public/js/constants.cc
+++ b/third_party/mojo/src/mojo/public/js/constants.cc
diff --git a/mojo/public/js/constants.h b/third_party/mojo/src/mojo/public/js/constants.h
index de75a90..de75a90 100644
--- a/mojo/public/js/constants.h
+++ b/third_party/mojo/src/mojo/public/js/constants.h
diff --git a/mojo/public/js/core.js b/third_party/mojo/src/mojo/public/js/core.js
index 6eb6ae6..6eb6ae6 100644
--- a/mojo/public/js/core.js
+++ b/third_party/mojo/src/mojo/public/js/core.js
diff --git a/mojo/public/js/core_unittests.js b/third_party/mojo/src/mojo/public/js/core_unittests.js
index 0f7b3ff..0f7b3ff 100644
--- a/mojo/public/js/core_unittests.js
+++ b/third_party/mojo/src/mojo/public/js/core_unittests.js
diff --git a/mojo/public/js/router.js b/third_party/mojo/src/mojo/public/js/router.js
index dba3e3c..dba3e3c 100644
--- a/mojo/public/js/router.js
+++ b/third_party/mojo/src/mojo/public/js/router.js
diff --git a/mojo/public/js/struct_unittests.js b/third_party/mojo/src/mojo/public/js/struct_unittests.js
index 39a8978..39a8978 100644
--- a/mojo/public/js/struct_unittests.js
+++ b/third_party/mojo/src/mojo/public/js/struct_unittests.js
diff --git a/mojo/public/js/support.js b/third_party/mojo/src/mojo/public/js/support.js
index 025da6c..025da6c 100644
--- a/mojo/public/js/support.js
+++ b/third_party/mojo/src/mojo/public/js/support.js
diff --git a/mojo/public/js/test/validation_test_input_parser.js b/third_party/mojo/src/mojo/public/js/test/validation_test_input_parser.js
index f5a57f9..f5a57f9 100644
--- a/mojo/public/js/test/validation_test_input_parser.js
+++ b/third_party/mojo/src/mojo/public/js/test/validation_test_input_parser.js
diff --git a/mojo/public/js/threading.js b/third_party/mojo/src/mojo/public/js/threading.js
index cfe5037..cfe5037 100644
--- a/mojo/public/js/threading.js
+++ b/third_party/mojo/src/mojo/public/js/threading.js
diff --git a/mojo/public/js/unicode.js b/third_party/mojo/src/mojo/public/js/unicode.js
index be2ba0e..be2ba0e 100644
--- a/mojo/public/js/unicode.js
+++ b/third_party/mojo/src/mojo/public/js/unicode.js
diff --git a/mojo/public/js/validation_unittests.js b/third_party/mojo/src/mojo/public/js/validation_unittests.js
index 05988f3..05988f3 100644
--- a/mojo/public/js/validation_unittests.js
+++ b/third_party/mojo/src/mojo/public/js/validation_unittests.js
diff --git a/mojo/public/js/validator.js b/third_party/mojo/src/mojo/public/js/validator.js
index a6be692..a6be692 100644
--- a/mojo/public/js/validator.js
+++ b/third_party/mojo/src/mojo/public/js/validator.js
diff --git a/mojo/public/mojo.gni b/third_party/mojo/src/mojo/public/mojo.gni
index b310260..b310260 100644
--- a/mojo/public/mojo.gni
+++ b/third_party/mojo/src/mojo/public/mojo.gni
diff --git a/mojo/public/mojo_application.gni b/third_party/mojo/src/mojo/public/mojo_application.gni
index 19abf74..19abf74 100644
--- a/mojo/public/mojo_application.gni
+++ b/third_party/mojo/src/mojo/public/mojo_application.gni
diff --git a/mojo/public/mojo_sdk.gni b/third_party/mojo/src/mojo/public/mojo_sdk.gni
index 6ac3e94..6ac3e94 100644
--- a/mojo/public/mojo_sdk.gni
+++ b/third_party/mojo/src/mojo/public/mojo_sdk.gni
diff --git a/mojo/public/platform/native/BUILD.gn b/third_party/mojo/src/mojo/public/platform/native/BUILD.gn
index a369e17..a369e17 100644
--- a/mojo/public/platform/native/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/platform/native/BUILD.gn
diff --git a/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.cc b/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.cc
index 0a47f33..0a47f33 100644
--- a/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.cc
+++ b/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.cc
diff --git a/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h b/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h
index af6817e..af6817e 100644
--- a/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h
+++ b/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h
diff --git a/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.cc b/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.cc
index db2bc81..db2bc81 100644
--- a/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.cc
+++ b/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.cc
diff --git a/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.h b/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.h
index 839e441..839e441 100644
--- a/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.h
+++ b/third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.h
diff --git a/mojo/public/platform/native/gles2_impl_thunks.cc b/third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.cc
index 66dbc39..66dbc39 100644
--- a/mojo/public/platform/native/gles2_impl_thunks.cc
+++ b/third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.cc
diff --git a/mojo/public/platform/native/gles2_impl_thunks.h b/third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.h
index 04174fa..04174fa 100644
--- a/mojo/public/platform/native/gles2_impl_thunks.h
+++ b/third_party/mojo/src/mojo/public/platform/native/gles2_impl_thunks.h
diff --git a/mojo/public/platform/native/gles2_thunks.cc b/third_party/mojo/src/mojo/public/platform/native/gles2_thunks.cc
index 365fac9..365fac9 100644
--- a/mojo/public/platform/native/gles2_thunks.cc
+++ b/third_party/mojo/src/mojo/public/platform/native/gles2_thunks.cc
diff --git a/mojo/public/platform/native/gles2_thunks.h b/third_party/mojo/src/mojo/public/platform/native/gles2_thunks.h
index 4718ab3..4718ab3 100644
--- a/mojo/public/platform/native/gles2_thunks.h
+++ b/third_party/mojo/src/mojo/public/platform/native/gles2_thunks.h
diff --git a/mojo/public/platform/native/system_thunks.cc b/third_party/mojo/src/mojo/public/platform/native/system_thunks.cc
index ed3227f..ed3227f 100644
--- a/mojo/public/platform/native/system_thunks.cc
+++ b/third_party/mojo/src/mojo/public/platform/native/system_thunks.cc
diff --git a/mojo/public/platform/native/system_thunks.h b/third_party/mojo/src/mojo/public/platform/native/system_thunks.h
index bb6ca96..bb6ca96 100644
--- a/mojo/public/platform/native/system_thunks.h
+++ b/third_party/mojo/src/mojo/public/platform/native/system_thunks.h
diff --git a/mojo/public/platform/native/thunk_export.h b/third_party/mojo/src/mojo/public/platform/native/thunk_export.h
index d118fc5..d118fc5 100644
--- a/mojo/public/platform/native/thunk_export.h
+++ b/third_party/mojo/src/mojo/public/platform/native/thunk_export.h
diff --git a/mojo/public/python/BUILD.gn b/third_party/mojo/src/mojo/public/python/BUILD.gn
index 5b9c8ab..5b9c8ab 100644
--- a/mojo/public/python/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/python/BUILD.gn
diff --git a/mojo/public/python/c_async_waiter.pxd b/third_party/mojo/src/mojo/public/python/c_async_waiter.pxd
index e2c3048..e2c3048 100644
--- a/mojo/public/python/c_async_waiter.pxd
+++ b/third_party/mojo/src/mojo/public/python/c_async_waiter.pxd
diff --git a/mojo/public/python/c_core.pxd b/third_party/mojo/src/mojo/public/python/c_core.pxd
index bd3edd9..bd3edd9 100644
--- a/mojo/public/python/c_core.pxd
+++ b/third_party/mojo/src/mojo/public/python/c_core.pxd
diff --git a/mojo/public/python/c_environment.pxd b/third_party/mojo/src/mojo/public/python/c_environment.pxd
index c1b37d6..c1b37d6 100644
--- a/mojo/public/python/c_environment.pxd
+++ b/third_party/mojo/src/mojo/public/python/c_environment.pxd
diff --git a/mojo/public/python/c_export.pxd b/third_party/mojo/src/mojo/public/python/c_export.pxd
index 2e26118..2e26118 100644
--- a/mojo/public/python/c_export.pxd
+++ b/third_party/mojo/src/mojo/public/python/c_export.pxd
diff --git a/mojo/public/python/c_thunks.pxd b/third_party/mojo/src/mojo/public/python/c_thunks.pxd
index 61d9156..61d9156 100644
--- a/mojo/public/python/c_thunks.pxd
+++ b/third_party/mojo/src/mojo/public/python/c_thunks.pxd
diff --git a/mojo/public/python/mojo_bindings/__init__.py b/third_party/mojo/src/mojo/public/python/mojo_bindings/__init__.py
index 4d6aabb..4d6aabb 100644
--- a/mojo/public/python/mojo_bindings/__init__.py
+++ b/third_party/mojo/src/mojo/public/python/mojo_bindings/__init__.py
diff --git a/mojo/public/python/mojo_bindings/descriptor.py b/third_party/mojo/src/mojo/public/python/mojo_bindings/descriptor.py
index 45e073f..45e073f 100644
--- a/mojo/public/python/mojo_bindings/descriptor.py
+++ b/third_party/mojo/src/mojo/public/python/mojo_bindings/descriptor.py
diff --git a/mojo/public/python/mojo_bindings/messaging.py b/third_party/mojo/src/mojo/public/python/mojo_bindings/messaging.py
index 385a080..385a080 100644
--- a/mojo/public/python/mojo_bindings/messaging.py
+++ b/third_party/mojo/src/mojo/public/python/mojo_bindings/messaging.py
diff --git a/mojo/public/python/mojo_bindings/promise.py b/third_party/mojo/src/mojo/public/python/mojo_bindings/promise.py
index ebf6f85..ebf6f85 100644
--- a/mojo/public/python/mojo_bindings/promise.py
+++ b/third_party/mojo/src/mojo/public/python/mojo_bindings/promise.py
diff --git a/mojo/public/python/mojo_bindings/reflection.py b/third_party/mojo/src/mojo/public/python/mojo_bindings/reflection.py
index 5432691..5432691 100644
--- a/mojo/public/python/mojo_bindings/reflection.py
+++ b/third_party/mojo/src/mojo/public/python/mojo_bindings/reflection.py
diff --git a/mojo/public/python/mojo_bindings/serialization.py b/third_party/mojo/src/mojo/public/python/mojo_bindings/serialization.py
index b5ea1bd..b5ea1bd 100644
--- a/mojo/public/python/mojo_bindings/serialization.py
+++ b/third_party/mojo/src/mojo/public/python/mojo_bindings/serialization.py
diff --git a/mojo/public/python/mojo_system.pyx b/third_party/mojo/src/mojo/public/python/mojo_system.pyx
index 4e684af..4e684af 100644
--- a/mojo/public/python/mojo_system.pyx
+++ b/third_party/mojo/src/mojo/public/python/mojo_system.pyx
diff --git a/mojo/public/python/mojo_system_impl.pyx b/third_party/mojo/src/mojo/public/python/mojo_system_impl.pyx
index 3e299c1..3e299c1 100644
--- a/mojo/public/python/mojo_system_impl.pyx
+++ b/third_party/mojo/src/mojo/public/python/mojo_system_impl.pyx
diff --git a/mojo/public/python/src/common.cc b/third_party/mojo/src/mojo/public/python/src/common.cc
index a80d013..a80d013 100644
--- a/mojo/public/python/src/common.cc
+++ b/third_party/mojo/src/mojo/public/python/src/common.cc
diff --git a/mojo/public/python/src/common.h b/third_party/mojo/src/mojo/public/python/src/common.h
index 03ed73b..03ed73b 100644
--- a/mojo/public/python/src/common.h
+++ b/third_party/mojo/src/mojo/public/python/src/common.h
diff --git a/mojo/public/python/src/python_system_helper.cc b/third_party/mojo/src/mojo/public/python/src/python_system_helper.cc
index 0c5a358..0c5a358 100644
--- a/mojo/public/python/src/python_system_helper.cc
+++ b/third_party/mojo/src/mojo/public/python/src/python_system_helper.cc
diff --git a/mojo/public/python/src/python_system_helper.h b/third_party/mojo/src/mojo/public/python/src/python_system_helper.h
index ff9bb0b..ff9bb0b 100644
--- a/mojo/public/python/src/python_system_helper.h
+++ b/third_party/mojo/src/mojo/public/python/src/python_system_helper.h
diff --git a/mojo/public/sky/BUILD.gn b/third_party/mojo/src/mojo/public/sky/BUILD.gn
index c7019be..c7019be 100644
--- a/mojo/public/sky/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/sky/BUILD.gn
diff --git a/mojo/public/sky/convert_amd_modules_to_sky.py b/third_party/mojo/src/mojo/public/sky/convert_amd_modules_to_sky.py
index ddff565..ddff565 100755
--- a/mojo/public/sky/convert_amd_modules_to_sky.py
+++ b/third_party/mojo/src/mojo/public/sky/convert_amd_modules_to_sky.py
diff --git a/mojo/public/tests/DEPS b/third_party/mojo/src/mojo/public/tests/DEPS
index 0669117..0669117 100644
--- a/mojo/public/tests/DEPS
+++ b/third_party/mojo/src/mojo/public/tests/DEPS
diff --git a/mojo/public/tests/test_support_private.cc b/third_party/mojo/src/mojo/public/tests/test_support_private.cc
index 0081984..0081984 100644
--- a/mojo/public/tests/test_support_private.cc
+++ b/third_party/mojo/src/mojo/public/tests/test_support_private.cc
diff --git a/mojo/public/tests/test_support_private.h b/third_party/mojo/src/mojo/public/tests/test_support_private.h
index d72e158..d72e158 100644
--- a/mojo/public/tests/test_support_private.h
+++ b/third_party/mojo/src/mojo/public/tests/test_support_private.h
diff --git a/mojo/public/third_party/README.txt b/third_party/mojo/src/mojo/public/third_party/README.txt
index 87d5cbb..87d5cbb 100644
--- a/mojo/public/third_party/README.txt
+++ b/third_party/mojo/src/mojo/public/third_party/README.txt
diff --git a/mojo/public/third_party/jinja2/AUTHORS b/third_party/mojo/src/mojo/public/third_party/jinja2/AUTHORS
index 943f625..943f625 100644
--- a/mojo/public/third_party/jinja2/AUTHORS
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/AUTHORS
diff --git a/mojo/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.md5 b/third_party/mojo/src/mojo/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.md5
index 5c9e7579..5c9e7579 100644
--- a/mojo/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.md5
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.md5
diff --git a/mojo/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.sha512 b/third_party/mojo/src/mojo/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.sha512
index 44b486d..44b486d 100644
--- a/mojo/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.sha512
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/Jinja2-2.7.1.tar.gz.sha512
diff --git a/mojo/public/third_party/jinja2/LICENSE b/third_party/mojo/src/mojo/public/third_party/jinja2/LICENSE
index 31bf900..31bf900 100644
--- a/mojo/public/third_party/jinja2/LICENSE
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/LICENSE
diff --git a/mojo/public/third_party/jinja2/OWNERS b/third_party/mojo/src/mojo/public/third_party/jinja2/OWNERS
index 8edbdf8..8edbdf8 100644
--- a/mojo/public/third_party/jinja2/OWNERS
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/OWNERS
diff --git a/mojo/public/third_party/jinja2/README.chromium b/third_party/mojo/src/mojo/public/third_party/jinja2/README.chromium
index 9ab2426..9ab2426 100644
--- a/mojo/public/third_party/jinja2/README.chromium
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/README.chromium
diff --git a/mojo/public/third_party/jinja2/__init__.py b/third_party/mojo/src/mojo/public/third_party/jinja2/__init__.py
index 6fa11c3..6fa11c3 100644
--- a/mojo/public/third_party/jinja2/__init__.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/__init__.py
diff --git a/mojo/public/third_party/jinja2/_compat.py b/third_party/mojo/src/mojo/public/third_party/jinja2/_compat.py
index 8fa8a49..8fa8a49 100644
--- a/mojo/public/third_party/jinja2/_compat.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/_compat.py
diff --git a/mojo/public/third_party/jinja2/_stringdefs.py b/third_party/mojo/src/mojo/public/third_party/jinja2/_stringdefs.py
index da5830e..da5830e 100644
--- a/mojo/public/third_party/jinja2/_stringdefs.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/_stringdefs.py
diff --git a/mojo/public/third_party/jinja2/bccache.py b/third_party/mojo/src/mojo/public/third_party/jinja2/bccache.py
index f2f9db6..f2f9db6 100644
--- a/mojo/public/third_party/jinja2/bccache.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/bccache.py
diff --git a/mojo/public/third_party/jinja2/compiler.py b/third_party/mojo/src/mojo/public/third_party/jinja2/compiler.py
index 75a60b8..75a60b8 100644
--- a/mojo/public/third_party/jinja2/compiler.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/compiler.py
diff --git a/mojo/public/third_party/jinja2/constants.py b/third_party/mojo/src/mojo/public/third_party/jinja2/constants.py
index cab203c..cab203c 100644
--- a/mojo/public/third_party/jinja2/constants.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/constants.py
diff --git a/mojo/public/third_party/jinja2/debug.py b/third_party/mojo/src/mojo/public/third_party/jinja2/debug.py
index 815cc18..815cc18 100644
--- a/mojo/public/third_party/jinja2/debug.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/debug.py
diff --git a/mojo/public/third_party/jinja2/defaults.py b/third_party/mojo/src/mojo/public/third_party/jinja2/defaults.py
index a27cb80..a27cb80 100644
--- a/mojo/public/third_party/jinja2/defaults.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/defaults.py
diff --git a/mojo/public/third_party/jinja2/environment.py b/third_party/mojo/src/mojo/public/third_party/jinja2/environment.py
index 45fabad..45fabad 100644
--- a/mojo/public/third_party/jinja2/environment.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/environment.py
diff --git a/mojo/public/third_party/jinja2/exceptions.py b/third_party/mojo/src/mojo/public/third_party/jinja2/exceptions.py
index c9df6dc..c9df6dc 100644
--- a/mojo/public/third_party/jinja2/exceptions.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/exceptions.py
diff --git a/mojo/public/third_party/jinja2/ext.py b/third_party/mojo/src/mojo/public/third_party/jinja2/ext.py
index c2df12d..c2df12d 100644
--- a/mojo/public/third_party/jinja2/ext.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/ext.py
diff --git a/mojo/public/third_party/jinja2/filters.py b/third_party/mojo/src/mojo/public/third_party/jinja2/filters.py
index fd0db04a..fd0db04a 100644
--- a/mojo/public/third_party/jinja2/filters.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/filters.py
diff --git a/mojo/public/third_party/jinja2/get_jinja2.sh b/third_party/mojo/src/mojo/public/third_party/jinja2/get_jinja2.sh
index 9502146..9502146 100755
--- a/mojo/public/third_party/jinja2/get_jinja2.sh
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/get_jinja2.sh
diff --git a/mojo/public/third_party/jinja2/lexer.py b/third_party/mojo/src/mojo/public/third_party/jinja2/lexer.py
index a501285..a501285 100644
--- a/mojo/public/third_party/jinja2/lexer.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/lexer.py
diff --git a/mojo/public/third_party/jinja2/loaders.py b/third_party/mojo/src/mojo/public/third_party/jinja2/loaders.py
index a9a2625..a9a2625 100644
--- a/mojo/public/third_party/jinja2/loaders.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/loaders.py
diff --git a/mojo/public/third_party/jinja2/meta.py b/third_party/mojo/src/mojo/public/third_party/jinja2/meta.py
index 3110cff..3110cff 100644
--- a/mojo/public/third_party/jinja2/meta.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/meta.py
diff --git a/mojo/public/third_party/jinja2/nodes.py b/third_party/mojo/src/mojo/public/third_party/jinja2/nodes.py
index c5697e6..c5697e6 100644
--- a/mojo/public/third_party/jinja2/nodes.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/nodes.py
diff --git a/mojo/public/third_party/jinja2/optimizer.py b/third_party/mojo/src/mojo/public/third_party/jinja2/optimizer.py
index 00eab11..00eab11 100644
--- a/mojo/public/third_party/jinja2/optimizer.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/optimizer.py
diff --git a/mojo/public/third_party/jinja2/parser.py b/third_party/mojo/src/mojo/public/third_party/jinja2/parser.py
index f60cd01..f60cd01 100644
--- a/mojo/public/third_party/jinja2/parser.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/parser.py
diff --git a/mojo/public/third_party/jinja2/runtime.py b/third_party/mojo/src/mojo/public/third_party/jinja2/runtime.py
index 7791c64..7791c64 100644
--- a/mojo/public/third_party/jinja2/runtime.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/runtime.py
diff --git a/mojo/public/third_party/jinja2/sandbox.py b/third_party/mojo/src/mojo/public/third_party/jinja2/sandbox.py
index da479c1..da479c1 100644
--- a/mojo/public/third_party/jinja2/sandbox.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/sandbox.py
diff --git a/mojo/public/third_party/jinja2/tests.py b/third_party/mojo/src/mojo/public/third_party/jinja2/tests.py
index 48a3e06..48a3e06 100644
--- a/mojo/public/third_party/jinja2/tests.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/tests.py
diff --git a/mojo/public/third_party/jinja2/utils.py b/third_party/mojo/src/mojo/public/third_party/jinja2/utils.py
index ddc47da..ddc47da 100644
--- a/mojo/public/third_party/jinja2/utils.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/utils.py
diff --git a/mojo/public/third_party/jinja2/visitor.py b/third_party/mojo/src/mojo/public/third_party/jinja2/visitor.py
index 413e7c3..413e7c3 100644
--- a/mojo/public/third_party/jinja2/visitor.py
+++ b/third_party/mojo/src/mojo/public/third_party/jinja2/visitor.py
diff --git a/mojo/public/third_party/markupsafe/AUTHORS b/third_party/mojo/src/mojo/public/third_party/markupsafe/AUTHORS
index f7e2942..f7e2942 100644
--- a/mojo/public/third_party/markupsafe/AUTHORS
+++ b/third_party/mojo/src/mojo/public/third_party/markupsafe/AUTHORS
diff --git a/mojo/public/third_party/markupsafe/LICENSE b/third_party/mojo/src/mojo/public/third_party/markupsafe/LICENSE
index 5d26938..5d26938 100644
--- a/mojo/public/third_party/markupsafe/LICENSE
+++ b/third_party/mojo/src/mojo/public/third_party/markupsafe/LICENSE
diff --git a/mojo/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.md5 b/third_party/mojo/src/mojo/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.md5
index 1348d1e..1348d1e 100644
--- a/mojo/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.md5
+++ b/third_party/mojo/src/mojo/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.md5
diff --git a/mojo/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.sha512 b/third_party/mojo/src/mojo/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.sha512
index ab75220..ab75220 100644
--- a/mojo/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.sha512
+++ b/third_party/mojo/src/mojo/public/third_party/markupsafe/MarkupSafe-0.18.tar.gz.sha512
diff --git a/mojo/public/third_party/markupsafe/OWNERS b/third_party/mojo/src/mojo/public/third_party/markupsafe/OWNERS
index 8edbdf8..8edbdf8 100644
--- a/mojo/public/third_party/markupsafe/OWNERS
+++ b/third_party/mojo/src/mojo/public/third_party/markupsafe/OWNERS
diff --git a/mojo/public/third_party/markupsafe/README.chromium b/third_party/mojo/src/mojo/public/third_party/markupsafe/README.chromium
index 0fcab52..0fcab52 100644
--- a/mojo/public/third_party/markupsafe/README.chromium
+++ b/third_party/mojo/src/mojo/public/third_party/markupsafe/README.chromium
diff --git a/mojo/public/third_party/markupsafe/__init__.py b/third_party/mojo/src/mojo/public/third_party/markupsafe/__init__.py
index 25f00d3..25f00d3 100644
--- a/mojo/public/third_party/markupsafe/__init__.py
+++ b/third_party/mojo/src/mojo/public/third_party/markupsafe/__init__.py
diff --git a/mojo/public/third_party/markupsafe/_compat.py b/third_party/mojo/src/mojo/public/third_party/markupsafe/_compat.py
index 29e4a3d..29e4a3d 100644
--- a/mojo/public/third_party/markupsafe/_compat.py
+++ b/third_party/mojo/src/mojo/public/third_party/markupsafe/_compat.py
diff --git a/mojo/public/third_party/markupsafe/_constants.py b/third_party/mojo/src/mojo/public/third_party/markupsafe/_constants.py
index 919bf03..919bf03 100644
--- a/mojo/public/third_party/markupsafe/_constants.py
+++ b/third_party/mojo/src/mojo/public/third_party/markupsafe/_constants.py
diff --git a/mojo/public/third_party/markupsafe/_native.py b/third_party/mojo/src/mojo/public/third_party/markupsafe/_native.py
index 5e83f10..5e83f10 100644
--- a/mojo/public/third_party/markupsafe/_native.py
+++ b/third_party/mojo/src/mojo/public/third_party/markupsafe/_native.py
diff --git a/mojo/public/third_party/markupsafe/_speedups.c b/third_party/mojo/src/mojo/public/third_party/markupsafe/_speedups.c
index f349feb..f349feb 100644
--- a/mojo/public/third_party/markupsafe/_speedups.c
+++ b/third_party/mojo/src/mojo/public/third_party/markupsafe/_speedups.c
diff --git a/mojo/public/third_party/markupsafe/get_markupsafe.sh b/third_party/mojo/src/mojo/public/third_party/markupsafe/get_markupsafe.sh
index d268832..d268832 100755
--- a/mojo/public/third_party/markupsafe/get_markupsafe.sh
+++ b/third_party/mojo/src/mojo/public/third_party/markupsafe/get_markupsafe.sh
diff --git a/mojo/public/third_party/ply/LICENSE b/third_party/mojo/src/mojo/public/third_party/ply/LICENSE
index b273866..b273866 100644
--- a/mojo/public/third_party/ply/LICENSE
+++ b/third_party/mojo/src/mojo/public/third_party/ply/LICENSE
diff --git a/mojo/public/third_party/ply/README b/third_party/mojo/src/mojo/public/third_party/ply/README
index f384d1a..f384d1a 100644
--- a/mojo/public/third_party/ply/README
+++ b/third_party/mojo/src/mojo/public/third_party/ply/README
diff --git a/mojo/public/third_party/ply/README.chromium b/third_party/mojo/src/mojo/public/third_party/ply/README.chromium
index 6466e54..6466e54 100644
--- a/mojo/public/third_party/ply/README.chromium
+++ b/third_party/mojo/src/mojo/public/third_party/ply/README.chromium
diff --git a/mojo/public/third_party/ply/__init__.py b/third_party/mojo/src/mojo/public/third_party/ply/__init__.py
index f3da03e..f3da03e 100644
--- a/mojo/public/third_party/ply/__init__.py
+++ b/third_party/mojo/src/mojo/public/third_party/ply/__init__.py
diff --git a/mojo/public/third_party/ply/lex.py b/third_party/mojo/src/mojo/public/third_party/ply/lex.py
index bd32da9..bd32da9 100644
--- a/mojo/public/third_party/ply/lex.py
+++ b/third_party/mojo/src/mojo/public/third_party/ply/lex.py
diff --git a/mojo/public/third_party/ply/license.patch b/third_party/mojo/src/mojo/public/third_party/ply/license.patch
index 7b2621f..7b2621f 100644
--- a/mojo/public/third_party/ply/license.patch
+++ b/third_party/mojo/src/mojo/public/third_party/ply/license.patch
diff --git a/mojo/public/third_party/ply/yacc.py b/third_party/mojo/src/mojo/public/third_party/ply/yacc.py
index f70439e..f70439e 100644
--- a/mojo/public/third_party/ply/yacc.py
+++ b/third_party/mojo/src/mojo/public/third_party/ply/yacc.py
diff --git a/mojo/public/tools/BUILD.gn b/third_party/mojo/src/mojo/public/tools/BUILD.gn
index 12cca6d..12cca6d 100644
--- a/mojo/public/tools/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/tools/BUILD.gn
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/enum_declaration.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/enum_declaration.tmpl
index 86c85d7d..86c85d7d 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/enum_declaration.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/enum_declaration.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/interface_declaration.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_declaration.tmpl
index 30d20d8..30d20d8 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/interface_declaration.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_declaration.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl
index fdbe8ca..fdbe8ca 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl
index fbefce2..fbefce2 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl
index 6b8e7c5..6b8e7c5 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/interface_request_validator_declaration.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_request_validator_declaration.tmpl
index 2239b69..2239b69 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/interface_request_validator_declaration.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_request_validator_declaration.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/interface_response_validator_declaration.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_response_validator_declaration.tmpl
index 801603d..801603d 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/interface_response_validator_declaration.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_response_validator_declaration.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl
index afc6504..afc6504 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/interface_stub_declaration.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl
index 116e86a..116e86a 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl
index 1ddcc45..1ddcc45 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
index 3da6c32..3da6c32 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/params_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/params_definition.tmpl
index 5de77d3..5de77d3 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/params_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/params_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/struct_declaration.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_declaration.tmpl
index 34c0f11..34c0f11 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/struct_declaration.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_declaration.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/struct_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_definition.tmpl
index 461f158..461f158 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/struct_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/struct_macros.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_macros.tmpl
index 623ebb4..623ebb4 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/struct_macros.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_macros.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_declaration.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_declaration.tmpl
index 604be86..604be86 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_declaration.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_declaration.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl
index 1612bbe..1612bbe 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl
index a29df07..a29df07 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_declaration.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_declaration.tmpl
index 25b39b3..25b39b3 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_declaration.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_declaration.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl
index da93e07..da93e07 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_declaration.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_declaration.tmpl
index 91ea7cf..91ea7cf 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_declaration.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_declaration.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl
index bab528c..bab528c 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/dart_templates/enum_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/dart_templates/enum_definition.tmpl
index 524b998..524b998 100644
--- a/mojo/public/tools/bindings/generators/dart_templates/enum_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/dart_templates/enum_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/dart_templates/interface_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/dart_templates/interface_definition.tmpl
index d9fee1c..d9fee1c 100644
--- a/mojo/public/tools/bindings/generators/dart_templates/interface_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/dart_templates/interface_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/dart_templates/module.lib.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/dart_templates/module.lib.tmpl
index 3512480..3512480 100644
--- a/mojo/public/tools/bindings/generators/dart_templates/module.lib.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/dart_templates/module.lib.tmpl
diff --git a/mojo/public/tools/bindings/generators/dart_templates/module_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/dart_templates/module_definition.tmpl
index cf72c1e..cf72c1e 100644
--- a/mojo/public/tools/bindings/generators/dart_templates/module_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/dart_templates/module_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/dart_templates/struct_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/dart_templates/struct_definition.tmpl
index f5b62a9..f5b62a9 100644
--- a/mojo/public/tools/bindings/generators/dart_templates/struct_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/dart_templates/struct_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/java_templates/constant_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/constant_definition.tmpl
index db193e2..db193e2 100644
--- a/mojo/public/tools/bindings/generators/java_templates/constant_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/constant_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/java_templates/constants.java.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/constants.java.tmpl
index 0a4e299..0a4e299 100644
--- a/mojo/public/tools/bindings/generators/java_templates/constants.java.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/constants.java.tmpl
diff --git a/mojo/public/tools/bindings/generators/java_templates/enum.java.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/enum.java.tmpl
index 7096a18..7096a18 100644
--- a/mojo/public/tools/bindings/generators/java_templates/enum.java.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/enum.java.tmpl
diff --git a/mojo/public/tools/bindings/generators/java_templates/enum_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/enum_definition.tmpl
index a16c178..a16c178 100644
--- a/mojo/public/tools/bindings/generators/java_templates/enum_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/enum_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/java_templates/header.java.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/header.java.tmpl
index ec6a88b..ec6a88b 100644
--- a/mojo/public/tools/bindings/generators/java_templates/header.java.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/header.java.tmpl
diff --git a/mojo/public/tools/bindings/generators/java_templates/interface.java.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface.java.tmpl
index 10e5d7a..10e5d7a 100644
--- a/mojo/public/tools/bindings/generators/java_templates/interface.java.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface.java.tmpl
diff --git a/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl
index 941fec7..941fec7 100644
--- a/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/java_templates/interface_internal.java.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface_internal.java.tmpl
index efb17f3..efb17f3 100644
--- a/mojo/public/tools/bindings/generators/java_templates/interface_internal.java.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/interface_internal.java.tmpl
diff --git a/mojo/public/tools/bindings/generators/java_templates/struct.java.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/struct.java.tmpl
index 232ec26..232ec26 100644
--- a/mojo/public/tools/bindings/generators/java_templates/struct.java.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/struct.java.tmpl
diff --git a/mojo/public/tools/bindings/generators/java_templates/struct_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/struct_definition.tmpl
index 0abdac4..0abdac4 100644
--- a/mojo/public/tools/bindings/generators/java_templates/struct_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/java_templates/struct_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/js_templates/enum_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/enum_definition.tmpl
index 4ae0a9b..4ae0a9b 100644
--- a/mojo/public/tools/bindings/generators/js_templates/enum_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/enum_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl
index 1b5cafa..1b5cafa 100644
--- a/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/js_templates/module.amd.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/module.amd.tmpl
index 6d7a1a2..6d7a1a2 100644
--- a/mojo/public/tools/bindings/generators/js_templates/module.amd.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/module.amd.tmpl
diff --git a/mojo/public/tools/bindings/generators/js_templates/module.sky.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/module.sky.tmpl
index 78cdf3f..78cdf3f 100644
--- a/mojo/public/tools/bindings/generators/js_templates/module.sky.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/module.sky.tmpl
diff --git a/mojo/public/tools/bindings/generators/js_templates/module_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/module_definition.tmpl
index 6448081..6448081 100644
--- a/mojo/public/tools/bindings/generators/js_templates/module_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/module_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl
index 62b497c..62b497c 100644
--- a/mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/mojom_cpp_generator.py b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_cpp_generator.py
index 34bba30..34bba30 100644
--- a/mojo/public/tools/bindings/generators/mojom_cpp_generator.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_cpp_generator.py
diff --git a/mojo/public/tools/bindings/generators/mojom_dart_generator.py b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_dart_generator.py
index 893e665..893e665 100644
--- a/mojo/public/tools/bindings/generators/mojom_dart_generator.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_dart_generator.py
diff --git a/mojo/public/tools/bindings/generators/mojom_java_generator.py b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py
index 276d5af..276d5af 100644
--- a/mojo/public/tools/bindings/generators/mojom_java_generator.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py
diff --git a/mojo/public/tools/bindings/generators/mojom_js_generator.py b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_js_generator.py
index 7aaeaa2..7aaeaa2 100644
--- a/mojo/public/tools/bindings/generators/mojom_js_generator.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_js_generator.py
diff --git a/mojo/public/tools/bindings/generators/mojom_python_generator.py b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_python_generator.py
index 33bfdd5..33bfdd5 100644
--- a/mojo/public/tools/bindings/generators/mojom_python_generator.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_python_generator.py
diff --git a/mojo/public/tools/bindings/generators/python_templates/module.py.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/python_templates/module.py.tmpl
index 9f2f3dc..9f2f3dc 100644
--- a/mojo/public/tools/bindings/generators/python_templates/module.py.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/python_templates/module.py.tmpl
diff --git a/mojo/public/tools/bindings/generators/python_templates/module_macros.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/python_templates/module_macros.tmpl
index b42fc30..b42fc30 100644
--- a/mojo/public/tools/bindings/generators/python_templates/module_macros.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/python_templates/module_macros.tmpl
diff --git a/mojo/public/tools/bindings/generators/run_cpp_generator.py b/third_party/mojo/src/mojo/public/tools/bindings/generators/run_cpp_generator.py
index 4c6f597..4c6f597 100755
--- a/mojo/public/tools/bindings/generators/run_cpp_generator.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/run_cpp_generator.py
diff --git a/mojo/public/tools/bindings/mojom.gni b/third_party/mojo/src/mojo/public/tools/bindings/mojom.gni
index d267fc92..d267fc92 100644
--- a/mojo/public/tools/bindings/mojom.gni
+++ b/third_party/mojo/src/mojo/public/tools/bindings/mojom.gni
diff --git a/mojo/public/tools/bindings/mojom_bindings_generator.py b/third_party/mojo/src/mojo/public/tools/bindings/mojom_bindings_generator.py
index 2d1802c..2d1802c 100755
--- a/mojo/public/tools/bindings/mojom_bindings_generator.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/mojom_bindings_generator.py
diff --git a/mojo/public/tools/bindings/mojom_bindings_generator_unittest.py b/third_party/mojo/src/mojo/public/tools/bindings/mojom_bindings_generator_unittest.py
index de38856..de38856 100644
--- a/mojo/public/tools/bindings/mojom_bindings_generator_unittest.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/mojom_bindings_generator_unittest.py
diff --git a/mojo/public/tools/bindings/mojom_list_outputs.py b/third_party/mojo/src/mojo/public/tools/bindings/mojom_list_outputs.py
index c30ca2c..c30ca2c 100755
--- a/mojo/public/tools/bindings/mojom_list_outputs.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/mojom_list_outputs.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/__init__.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/__init__.py
index e69de29..e69de29 100644
--- a/mojo/public/tools/bindings/pylib/mojom/__init__.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/__init__.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/error.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/error.py
index 99522b9..99522b9 100644
--- a/mojo/public/tools/bindings/pylib/mojom/error.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/error.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/__init__.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/__init__.py
index e69de29..e69de29 100644
--- a/mojo/public/tools/bindings/pylib/mojom/generate/__init__.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/__init__.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/data.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/data.py
index 6d34a40..6d34a40 100644
--- a/mojo/public/tools/bindings/pylib/mojom/generate/data.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/data.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/data_tests.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/data_tests.py
index 096554c..096554c 100644
--- a/mojo/public/tools/bindings/pylib/mojom/generate/data_tests.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/data_tests.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/generator.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/generator.py
index af14ead..af14ead 100644
--- a/mojo/public/tools/bindings/pylib/mojom/generate/generator.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/generator.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/module.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/module.py
index 8e52924..8e52924 100644
--- a/mojo/public/tools/bindings/pylib/mojom/generate/module.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/module.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/module_tests.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/module_tests.py
index a887686..a887686 100644
--- a/mojo/public/tools/bindings/pylib/mojom/generate/module_tests.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/module_tests.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/pack.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/pack.py
index 8f7bb3b..8f7bb3b 100644
--- a/mojo/public/tools/bindings/pylib/mojom/generate/pack.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/pack.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/pack_tests.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/pack_tests.py
index 14f699d..14f699d 100644
--- a/mojo/public/tools/bindings/pylib/mojom/generate/pack_tests.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/pack_tests.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/run_tests.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/run_tests.py
index 41f11a2..41f11a2 100755
--- a/mojo/public/tools/bindings/pylib/mojom/generate/run_tests.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/run_tests.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py
index 94db92e..94db92e 100644
--- a/mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/test_support.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/test_support.py
index eb39461..eb39461 100644
--- a/mojo/public/tools/bindings/pylib/mojom/generate/test_support.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/generate/test_support.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/parse/__init__.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/__init__.py
index e69de29..e69de29 100644
--- a/mojo/public/tools/bindings/pylib/mojom/parse/__init__.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/__init__.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/parse/ast.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/ast.py
index e1fa4f8..e1fa4f8 100644
--- a/mojo/public/tools/bindings/pylib/mojom/parse/ast.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/ast.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/parse/lexer.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/lexer.py
index 476a662..476a662 100644
--- a/mojo/public/tools/bindings/pylib/mojom/parse/lexer.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/lexer.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/parse/parser.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/parser.py
index 4225f0a..4225f0a 100644
--- a/mojo/public/tools/bindings/pylib/mojom/parse/parser.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/parser.py
diff --git a/mojo/public/tools/bindings/pylib/mojom/parse/translate.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/translate.py
index 88bd269..88bd269 100644
--- a/mojo/public/tools/bindings/pylib/mojom/parse/translate.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom/parse/translate.py
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/__init__.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/__init__.py
index e69de29..e69de29 100644
--- a/mojo/public/tools/bindings/pylib/mojom_tests/__init__.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/__init__.py
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/generate/__init__.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/generate/__init__.py
index e69de29..e69de29 100644
--- a/mojo/public/tools/bindings/pylib/mojom_tests/generate/__init__.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/generate/__init__.py
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/generate/data_unittest.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/generate/data_unittest.py
index 9ad63c1..9ad63c1 100644
--- a/mojo/public/tools/bindings/pylib/mojom_tests/generate/data_unittest.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/generate/data_unittest.py
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/generate/module_unittest.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/generate/module_unittest.py
index 821a721..821a721 100644
--- a/mojo/public/tools/bindings/pylib/mojom_tests/generate/module_unittest.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/generate/module_unittest.py
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/parse/__init__.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/__init__.py
index e69de29..e69de29 100644
--- a/mojo/public/tools/bindings/pylib/mojom_tests/parse/__init__.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/__init__.py
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/parse/ast_unittest.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/ast_unittest.py
index dd28cdd..dd28cdd 100644
--- a/mojo/public/tools/bindings/pylib/mojom_tests/parse/ast_unittest.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/ast_unittest.py
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/parse/lexer_unittest.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/lexer_unittest.py
index 97079a7..97079a7 100644
--- a/mojo/public/tools/bindings/pylib/mojom_tests/parse/lexer_unittest.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/lexer_unittest.py
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/parse/parser_unittest.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/parser_unittest.py
index 65c2fca..65c2fca 100644
--- a/mojo/public/tools/bindings/pylib/mojom_tests/parse/parser_unittest.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/parser_unittest.py
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_parser.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_parser.py
index b160de6..b160de6 100755
--- a/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_parser.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_parser.py
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_translate.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_translate.py
index 899d40e..899d40e 100755
--- a/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_translate.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/run_translate.py
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/parse/translate_unittest.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/translate_unittest.py
index 9f2d985..9f2d985 100644
--- a/mojo/public/tools/bindings/pylib/mojom_tests/parse/translate_unittest.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/parse/translate_unittest.py
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/support/__init__.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/support/__init__.py
index e69de29..e69de29 100644
--- a/mojo/public/tools/bindings/pylib/mojom_tests/support/__init__.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/support/__init__.py
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/support/find_files.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/support/find_files.py
index 2a4b17b..2a4b17b 100644
--- a/mojo/public/tools/bindings/pylib/mojom_tests/support/find_files.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/support/find_files.py
diff --git a/mojo/public/tools/bindings/pylib/mojom_tests/support/run_bindings_generator.py b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/support/run_bindings_generator.py
index 20ef461..20ef461 100644
--- a/mojo/public/tools/bindings/pylib/mojom_tests/support/run_bindings_generator.py
+++ b/third_party/mojo/src/mojo/public/tools/bindings/pylib/mojom_tests/support/run_bindings_generator.py
diff --git a/mojo/public/tools/download_shell_binary.py b/third_party/mojo/src/mojo/public/tools/download_shell_binary.py
index b46139e..b46139e 100755
--- a/mojo/public/tools/download_shell_binary.py
+++ b/third_party/mojo/src/mojo/public/tools/download_shell_binary.py
diff --git a/mojo/public/tools/prepend.py b/third_party/mojo/src/mojo/public/tools/prepend.py
index de70a82..de70a82 100755
--- a/mojo/public/tools/prepend.py
+++ b/third_party/mojo/src/mojo/public/tools/prepend.py
diff --git a/ui/keyboard/BUILD.gn b/ui/keyboard/BUILD.gn
index bbc3cc8..21d2417 100644
--- a/ui/keyboard/BUILD.gn
+++ b/ui/keyboard/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 import("//third_party/google_input_tools/closure.gni")
 import("//third_party/google_input_tools/inputview.gni")
 import("//tools/grit/grit_rule.gni")
@@ -40,11 +40,11 @@ component("keyboard") {
     "//base/third_party/dynamic_annotations",
     "//content/public/browser",
     "//content/public/common",
-    "//mojo/edk/js",
-    "//mojo/edk/system",
     "//mojo/environment:chromium",
-    "//mojo/public/cpp/bindings",
-    "//mojo/public/cpp/system",
+    "//third_party/mojo/src/mojo/edk/js",
+    "//third_party/mojo/src/mojo/edk/system",
+    "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//third_party/mojo/src/mojo/public/cpp/system",
     "//url",
     "//ui/aura",
     "//ui/base",
diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp
index 2bebf2e..681d007 100644
--- a/ui/keyboard/keyboard.gyp
+++ b/ui/keyboard/keyboard.gyp
@@ -16,7 +16,7 @@
       'sources': [
         'webui/keyboard.mojom',
       ],
-      'includes': [ '../../mojo/mojom_bindings_generator.gypi' ],
+      'includes': [ '../../third_party/mojo/mojom_bindings_generator.gypi' ],
     },
     {
       # GN version: //ui/keyboard:resources
@@ -63,10 +63,10 @@
         '../../content/content.gyp:content_browser',
         '../../ipc/ipc.gyp:ipc',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
-        '../../mojo/mojo_public.gyp:mojo_js_bindings',
         '../../skia/skia.gyp:skia',
+        '../../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',
         '../../url/url.gyp:url_lib',
         '../aura/aura.gyp:aura',
         '../base/ui_base.gyp:ui_base',