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}
faceless2 · Feb 3, 2018 · 7d9600c · 7d9600c
1 parent 2a93e5f
commit 7d9600c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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');
   }
 
 

diff --git 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');
   }
 
 

diff --git 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) {
 
 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",

diff --git a/resources/chromium/webusb-test.js b/resources/chromium/webusb-test.js
@@ -20,12 +20,12 @@ let internal = {
 };
 
 // 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) {