2 files changed, 4 insertions, 4 deletions
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;
         }
       }