Update mojo sdk to rev 04a510fb37db10642e156957f9b2c11c2f6442ac

This updates the mojo sdk and updates chromium code to match. The most
significant change is updating references to the mojo JS bindings code,
which reshuffled. This part was reviewed separately by hansmuller@ in
https://codereview.chromium.org/693343003/. This also updates ipc/mojo
to reflect changes in ChannelInfo.

R=morrita@chromium.org for ipc/mojo
R=jam@chromium.org for top-level approval of the rest

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

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

13 files changed, 21 insertions, 21 deletions

diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
index 2a4d374..5808371 100644
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -266,7 +266,7 @@ test("extensions_unittests") {
     "//extensions/common",
     "//extensions/renderer",
     "//extensions/strings",
-    "//mojo/bindings/js",
+    "//mojo/edk/js",
     "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index f146669..b4c2680 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -1130,9 +1130,9 @@
         '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
         '../device/serial/serial.gyp:device_serial',
         '../device/serial/serial.gyp:device_serial_test_util',
+        '../mojo/edk/mojo_edk.gyp:mojo_js_lib',
         '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
         '../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../mojo/mojo_base.gyp:mojo_js_bindings_lib',
         '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
diff --git a/extensions/renderer/BUILD.gn b/extensions/renderer/BUILD.gn
index 5e02517..f91479d 100644
--- a/extensions/renderer/BUILD.gn
+++ b/extensions/renderer/BUILD.gn
@@ -167,7 +167,7 @@ source_set("renderer") {
     "//content:resources",
     "//extensions:extensions_resources",
     "//gin",
-    "//mojo/bindings/js",
+    "//mojo/edk/js",
     "//skia",
     "//third_party/WebKit/public:blink",
   ]
diff --git a/extensions/renderer/DEPS b/extensions/renderer/DEPS
index 111fc81..fadfee7 100644
--- a/extensions/renderer/DEPS
+++ b/extensions/renderer/DEPS
@@ -2,7 +2,7 @@ include_rules = [
   "+content/public/renderer",
 
   "+gin",
-  "+mojo/bindings/js",
+  "+mojo/edk/js",
 
   "+third_party/skia/include/core",
 
diff --git a/extensions/renderer/api_test_base.cc b/extensions/renderer/api_test_base.cc
index 17e09c2..46a6ac2 100644
--- a/extensions/renderer/api_test_base.cc
+++ b/extensions/renderer/api_test_base.cc
@@ -12,9 +12,9 @@
 #include "extensions/renderer/process_info_native_handler.h"
 #include "gin/converter.h"
 #include "gin/dictionary.h"
-#include "mojo/bindings/js/core.h"
-#include "mojo/bindings/js/handle.h"
-#include "mojo/bindings/js/support.h"
+#include "mojo/edk/js/core.h"
+#include "mojo/edk/js/handle.h"
+#include "mojo/edk/js/support.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/system/core.h"
 
diff --git a/extensions/renderer/api_test_base.h b/extensions/renderer/api_test_base.h
index 3684080..1989727 100644
--- a/extensions/renderer/api_test_base.h
+++ b/extensions/renderer/api_test_base.h
@@ -17,7 +17,7 @@
 #include "gin/modules/module_registry.h"
 #include "gin/object_template_builder.h"
 #include "gin/wrappable.h"
-#include "mojo/bindings/js/handle.h"
+#include "mojo/edk/js/handle.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/system/core.h"
 
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index 1de7dcf..cfe247d 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -80,7 +80,7 @@
 #include "extensions/renderer/utils_native_handler.h"
 #include "extensions/renderer/v8_context_native_handler.h"
 #include "grit/extensions_renderer_resources.h"
-#include "mojo/public/js/bindings/constants.h"
+#include "mojo/public/js/constants.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebCustomElement.h"
diff --git a/extensions/renderer/resources/async_waiter.js b/extensions/renderer/resources/async_waiter.js
index 3dabeff..6470f64 100644
--- a/extensions/renderer/resources/async_waiter.js
+++ b/extensions/renderer/resources/async_waiter.js
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 define('async_waiter', [
-    'mojo/public/js/bindings/support',
+    'mojo/public/js/support',
 ], function(supportModule) {
   /**
    * @module async_waiter
diff --git a/extensions/renderer/resources/data_receiver.js b/extensions/renderer/resources/data_receiver.js
index 70009c2..0f286be 100644
--- a/extensions/renderer/resources/data_receiver.js
+++ b/extensions/renderer/resources/data_receiver.js
@@ -5,8 +5,8 @@
 define('data_receiver', [
     'device/serial/data_stream.mojom',
     'device/serial/data_stream_serialization.mojom',
-    'mojo/public/js/bindings/core',
-    'mojo/public/js/bindings/router',
+    'mojo/public/js/core',
+    'mojo/public/js/router',
 ], function(dataStream, serialization, core, router) {
   /**
    * @module data_receiver
@@ -135,7 +135,7 @@ define('data_receiver', [
                                           pendingData,
                                           paused) {
     /**
-     * The [Router]{@link module:mojo/public/js/bindings/router.Router} for the
+     * The [Router]{@link module:mojo/public/js/router.Router} for the
      * connection to the DataSource.
      * @private
      */
diff --git a/extensions/renderer/resources/data_sender.js b/extensions/renderer/resources/data_sender.js
index 99935c4..db259ec 100644
--- a/extensions/renderer/resources/data_sender.js
+++ b/extensions/renderer/resources/data_sender.js
@@ -5,8 +5,8 @@
 define('data_sender', [
     'device/serial/data_stream.mojom',
     'device/serial/data_stream_serialization.mojom',
-    'mojo/public/js/bindings/core',
-    'mojo/public/js/bindings/router',
+    'mojo/public/js/core',
+    'mojo/public/js/router',
 ], function(dataStreamMojom, serialization, core, routerModule) {
   /**
    * @module data_sender
@@ -221,7 +221,7 @@ define('data_sender', [
      */
     this.shutDown_ = false;
     /**
-     * The [Router]{@link module:mojo/public/js/bindings/router.Router} for the
+     * The [Router]{@link module:mojo/public/js/router.Router} for the
      * connection to the DataSink.
      * @private
      */
diff --git a/extensions/renderer/resources/keep_alive.js b/extensions/renderer/resources/keep_alive.js
index 281e851..aa5f6a0 100644
--- a/extensions/renderer/resources/keep_alive.js
+++ b/extensions/renderer/resources/keep_alive.js
@@ -5,7 +5,7 @@
 define('keep_alive', [
     'content/public/renderer/service_provider',
     'extensions/common/mojo/keep_alive.mojom',
-    'mojo/public/js/bindings/core',
+    'mojo/public/js/core',
 ], function(serviceProvider, mojom, core) {
 
   /**
diff --git a/extensions/renderer/resources/serial_service.js b/extensions/renderer/resources/serial_service.js
index 6d57cee..d0f2976 100644
--- a/extensions/renderer/resources/serial_service.js
+++ b/extensions/renderer/resources/serial_service.js
@@ -8,8 +8,8 @@ define('serial_service', [
     'data_sender',
     'device/serial/serial.mojom',
     'device/serial/serial_serialization.mojom',
-    'mojo/public/js/bindings/core',
-    'mojo/public/js/bindings/router',
+    'mojo/public/js/core',
+    'mojo/public/js/router',
 ], function(serviceProvider,
             dataReceiver,
             dataSender,
diff --git a/extensions/test/data/api_test_base_unittest.js b/extensions/test/data/api_test_base_unittest.js
index c402d59..46641ba 100644
--- a/extensions/test/data/api_test_base_unittest.js
+++ b/extensions/test/data/api_test_base_unittest.js
@@ -36,8 +36,8 @@ unittestBindings.exportTests([
   },
   function testMojoModulesAreAvailable() {
     Promise.all([
-      requireAsync('mojo/public/js/bindings/connection'),
-      requireAsync('mojo/public/js/bindings/core'),
+      requireAsync('mojo/public/js/connection'),
+      requireAsync('mojo/public/js/core'),
       requireAsync('content/public/renderer/service_provider'),
     ]).then(test.callback(function(modules) {
       var connection = modules[0];