BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

7 files changed, 21 insertions, 14 deletions

diff --git a/chromium/mojo/public/js/BUILD.gn b/chromium/mojo/public/js/BUILD.gn
index c842406970e..47ee8536397 100644
--- a/chromium/mojo/public/js/BUILD.gn
+++ b/chromium/mojo/public/js/BUILD.gn
@@ -61,7 +61,7 @@ js_library("bindings_lite_sources") {
   deps = [ "//mojo/public/interfaces/bindings:bindings_js_library_for_compile" ]
 }
 
-if (enable_mojom_closure_compile || closure_compile) {
+if (enable_mojom_closure_compile || enable_js_type_check) {
   js_binary("bindings_lite") {
     outputs = [ bindings_lite_compiled_file ]
     deps = [ ":bindings_lite_sources" ]
diff --git a/chromium/mojo/public/js/bindings.js b/chromium/mojo/public/js/bindings.js
index a82f43dddac..30a76104695 100644
--- a/chromium/mojo/public/js/bindings.js
+++ b/chromium/mojo/public/js/bindings.js
@@ -136,7 +136,7 @@
     this.handle_ = null;
 
     this.interfaceEndpointClient_ = new internal.InterfaceEndpointClient(
-        this.router_.createLocalEndpointHandle(internal.kMasterInterfaceId));
+        this.router_.createLocalEndpointHandle(internal.kPrimaryInterfaceId));
 
     this.interfaceEndpointClient_ .setPayloadValidators([
         this.interfaceType_.validateResponse]);
@@ -214,7 +214,7 @@
 
     this.stub_ = new this.interfaceType_.stubClass(this.impl_);
     this.interfaceEndpointClient_ = new internal.InterfaceEndpointClient(
-        this.router_.createLocalEndpointHandle(internal.kMasterInterfaceId),
+        this.router_.createLocalEndpointHandle(internal.kPrimaryInterfaceId),
         this.stub_, this.interfaceType_.kVersion);
 
     this.interfaceEndpointClient_ .setPayloadValidators([
@@ -345,7 +345,7 @@
   //
   //    // A locally-created associated interface pointer can only be used to
   //    // make calls when the corresponding associated request is sent over
-  //    // another interface (either the master interface or another
+  //    // another interface (either the primary interface or another
   //    // associated interface).
   //    var associatedInterfacePtrInfo = new AssociatedInterfacePtrInfo();
   //    var associatedRequest = makeRequest(interfacePtrInfo);
diff --git a/chromium/mojo/public/js/interface_types.js b/chromium/mojo/public/js/interface_types.js
index b7085e5a90b..83448a450e9 100644
--- a/chromium/mojo/public/js/interface_types.js
+++ b/chromium/mojo/public/js/interface_types.js
@@ -7,7 +7,7 @@
 
   // Constants ----------------------------------------------------------------
   var kInterfaceIdNamespaceMask = 0x80000000;
-  var kMasterInterfaceId = 0x00000000;
+  var kPrimaryInterfaceId = 0x00000000;
   var kInvalidInterfaceId = 0xFFFFFFFF;
 
   // ---------------------------------------------------------------------------
@@ -69,8 +69,8 @@
     this.interfaceEndpointHandle.reset(reason);
   };
 
-  function isMasterInterfaceId(interfaceId) {
-    return interfaceId === kMasterInterfaceId;
+  function isPrimaryInterfaceId(interfaceId) {
+    return interfaceId === kPrimaryInterfaceId;
   }
 
   function isValidInterfaceId(interfaceId) {
@@ -88,10 +88,10 @@
   mojo.InterfaceRequest = InterfaceRequest;
   mojo.AssociatedInterfacePtrInfo = AssociatedInterfacePtrInfo;
   mojo.AssociatedInterfaceRequest = AssociatedInterfaceRequest;
-  internal.isMasterInterfaceId = isMasterInterfaceId;
+  internal.isPrimaryInterfaceId = isPrimaryInterfaceId;
   internal.isValidInterfaceId = isValidInterfaceId;
   internal.hasInterfaceIdNamespaceBitSet = hasInterfaceIdNamespaceBitSet;
   internal.kInvalidInterfaceId = kInvalidInterfaceId;
-  internal.kMasterInterfaceId = kMasterInterfaceId;
+  internal.kPrimaryInterfaceId = kPrimaryInterfaceId;
   internal.kInterfaceIdNamespaceMask = kInterfaceIdNamespaceMask;
 })();
diff --git a/chromium/mojo/public/js/lib/router.js b/chromium/mojo/public/js/lib/router.js
index 251f3a97fef..1fa309f731c 100644
--- a/chromium/mojo/public/js/lib/router.js
+++ b/chromium/mojo/public/js/lib/router.js
@@ -165,10 +165,10 @@
       return new internal.InterfaceEndpointHandle();
     }
 
-    // Unless it is the master ID, |interfaceId| is from the remote side and
+    // Unless it is the primary ID, |interfaceId| is from the remote side and
     // therefore its namespace bit is supposed to be different than the value
     // that this router would use.
-    if (!internal.isMasterInterfaceId(interfaceId) &&
+    if (!internal.isPrimaryInterfaceId(interfaceId) &&
         this.setInterfaceIdNamespaceBit_ ===
             internal.hasInterfaceIdNamespaceBitSet(interfaceId)) {
       return new internal.InterfaceEndpointHandle();
@@ -290,7 +290,7 @@
     this.updateEndpointStateMayRemove(endpoint,
         EndpointStateUpdateType.ENDPOINT_CLOSED);
 
-    if (!internal.isMasterInterfaceId(interfaceId) || reason) {
+    if (!internal.isPrimaryInterfaceId(interfaceId) || reason) {
       this.controlMessageProxy_.notifyPeerEndpointClosed(interfaceId, reason);
     }
 
diff --git a/chromium/mojo/public/js/lib/validator.js b/chromium/mojo/public/js/lib/validator.js
index 577dcf00339..f32419e6b5e 100644
--- a/chromium/mojo/public/js/lib/validator.js
+++ b/chromium/mojo/public/js/lib/validator.js
@@ -323,7 +323,7 @@
     if (this.payloadInterfaceIds) {
       for (var interfaceId of this.payloadInterfaceIds) {
         if (!internal.isValidInterfaceId(interfaceId) ||
-            internal.isMasterInterfaceId(interfaceId)) {
+            internal.isPrimaryInterfaceId(interfaceId)) {
           return validationError.ILLEGAL_INTERFACE_ID;
         }
       }
diff --git a/chromium/mojo/public/js/test/BUILD.gn b/chromium/mojo/public/js/test/BUILD.gn
index 68397db1435..8c0a853223a 100644
--- a/chromium/mojo/public/js/test/BUILD.gn
+++ b/chromium/mojo/public/js/test/BUILD.gn
@@ -15,7 +15,7 @@ mojom("test_mojom") {
   ]
 }
 
-if (enable_mojom_closure_compile || closure_compile) {
+if (enable_mojom_closure_compile || enable_js_type_check) {
   js_binary("compile_test") {
     outputs = [ "$target_gen_dir/compile_test.js" ]
     deps = [ ":test_mojom_js_library_for_compile" ]
diff --git a/chromium/mojo/public/js/ts/bindings/tests/BUILD.gn b/chromium/mojo/public/js/ts/bindings/tests/BUILD.gn
index bafb2d6808a..81873c95bb4 100644
--- a/chromium/mojo/public/js/ts/bindings/tests/BUILD.gn
+++ b/chromium/mojo/public/js/ts/bindings/tests/BUILD.gn
@@ -11,7 +11,14 @@ mojom("test_interfaces") {
   sources = [
     "constants.test-mojom",
     "enums.test-mojom",
+    "export1.test-mojom",
+    "export2.test-mojom",
+    "export3.test-mojom",
+    "export4.test-mojom",
+    "import.test-mojom",
     "module.test-mojom",
+    "other_dir/other_dir.test-mojom",
+    "structs.test-mojom",
   ]
   use_typescript_sources = true
 }