commit 7d9600cc315918fa425cb68da7ccb57cdabe010d
author Ken Rockot <rockot@chromium.org> Sat Feb 03 20:37:57 2018
committer Blink WPT Bot <blink-w3c-test-autoroller@chromium.org> Sat Feb 03 20:45:53 2018
tree 7d5418c4ff364d1f28aaa0e53447c85a48b3219a
parent 2a93e5f20086f98d55bc1304b302286266eb79af

Move String16 mojom to mojo/public/cpp/base

Also, for filenames related to String16, struct_traits => mojom_traits
and CommonCustomTypesStructTraits => String16MojomTraits

TBR=sky@chromium.org

Bug: 806965,799482
Change-Id: I4f725df6a90bc1d5ec75988bff281bf87832714b
Reviewed-on: https://chromium-review.googlesource.com/900060
Commit-Queue: Ken Rockot <rockot@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534282}

resources/chromium/device.mojom.js

diff --git a/resources/chromium/device.mojom.js b/resources/chromium/device.mojom.js
index 6f37fab..86c93dd 100644
--- a/resources/chromium/device.mojom.js
+++ b/resources/chromium/device.mojom.js
@@ -21,7 +21,7 @@
       mojo.internal.exposeNamespace('mojo.common.mojom');
   if (mojo.config.autoLoadMojomDeps) {
     mojo.internal.loadMojomIfNecessary(
-        'mojo/common/string16.mojom', '../../../../mojo/common/string16.mojom.js');
+        'mojo/public/mojom/base/string16.mojom', '../../../../mojo/public/mojom/base/string16.mojom.js');
   }
 
 

resources/chromium/device_manager.mojom.js

diff --git a/resources/chromium/device_manager.mojom.js b/resources/chromium/device_manager.mojom.js
index f490b65..2e1b301 100644
--- a/resources/chromium/device_manager.mojom.js
+++ b/resources/chromium/device_manager.mojom.js
@@ -27,7 +27,7 @@
       mojo.internal.exposeNamespace('mojo.common.mojom');
   if (mojo.config.autoLoadMojomDeps) {
     mojo.internal.loadMojomIfNecessary(
-        'mojo/common/string16.mojom', '../../../../mojo/common/string16.mojom.js');
+        'mojo/public/mojom/base/string16.mojom', '../../../../mojo/public/mojom/base/string16.mojom.js');
   }
 
 

resources/chromium/string16.mojom.js

diff --git a/resources/chromium/string16.mojom.js b/resources/chromium/string16.mojom.js
index 058956b..9dbb356 100644
--- a/resources/chromium/string16.mojom.js
+++ b/resources/chromium/string16.mojom.js
@@ -7,7 +7,7 @@
 if ((typeof mojo !== 'undefined')  && mojo.internal && mojo.config) {
 
 (function() {
-  var mojomId = 'mojo/common/string16.mojom';
+  var mojomId = 'mojo/public/mojom/base/string16.mojom';
   if (mojo.internal.isMojomLoaded(mojomId)) {
     console.warn('The following mojom is loaded multiple times: ' + mojomId);
     return;
@@ -87,7 +87,7 @@
 
 if ((typeof mojo === 'undefined') || !mojo.internal || !mojo.config) {
 
-define("mojo/common/string16.mojom", [
+define("mojo/public/mojom/base/string16.mojom", [
     "mojo/public/js/associated_bindings",
     "mojo/public/js/bindings",
     "mojo/public/js/codec",

resources/chromium/webusb-test.js

diff --git a/resources/chromium/webusb-test.js b/resources/chromium/webusb-test.js
index 08c8254..502dd5c 100644
--- a/resources/chromium/webusb-test.js
+++ b/resources/chromium/webusb-test.js
@@ -20,12 +20,12 @@
 };
 
 // Converts an ECMAScript String object to an instance of
-// mojo.common.mojom.String16.
+// mojo_base.mojom.String16.
 function mojoString16ToString(string16) {
   return String.fromCharCode.apply(null, string16.data);
 }
 
-// Converts an instance of mojo.common.mojom.String16 to an ECMAScript String.
+// Converts an instance of mojo_base.mojom.String16 to an ECMAScript String.
 function stringToMojoString16(string) {
   let array = new Array(string.length);
   for (var i = 0; i < string.length; ++i) {