BASELINE: Update Chromium to 85.0.4183.14085-based

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

3 files changed, 57 insertions, 57 deletions

diff --git a/chromium/chrome/browser/resources/interventions_internals/index.css b/chromium/chrome/browser/resources/interventions_internals/index.css
index 1af46cd12f4..dec856074a3 100644
--- a/chromium/chrome/browser/resources/interventions_internals/index.css
+++ b/chromium/chrome/browser/resources/interventions_internals/index.css
@@ -26,7 +26,7 @@ body {
 }
 
 .previews-flag-value {
-  margin-left: 10px;
+  margin-inline-start: 10px;
 }
 
 button {
@@ -138,7 +138,7 @@ table {
 td {
   border: 0;
   padding: 10px;
-  text-align: left;
+  text-align: start;
   vertical-align: middle;
 }
 
@@ -205,14 +205,14 @@ td.log-url .url-tooltip::after {
   bottom: 100%;
   content: ' ';
   left: 50%;
-  margin-left: -5px;
+  margin-inline-start: -5px;
   position: absolute;
 }
 
 .expansion-row {
   background: transparent;
   border: 0;
-  margin-left: 20px;
+  margin-inline-start: 20px;
   padding: 0 0 0 15px;
   width: 80%;
 }
@@ -268,7 +268,7 @@ tr.expansion-row td:nth-child(odd) {
     width: 60%;
   }
 
-  #blacklisted-hosts-table {
+  #blocklisted-hosts-table {
     width: 60%;
   }
 
@@ -354,7 +354,7 @@ i {
   font-style: italic;
 }
 
-#blacklist-ignored-status {
+#blocklist-ignored-status {
   color: red;
   font-style: italic;
   font-weight: bold;
diff --git a/chromium/chrome/browser/resources/interventions_internals/index.html b/chromium/chrome/browser/resources/interventions_internals/index.html
index 4f171561365..dd5f3ad7a7d 100644
--- a/chromium/chrome/browser/resources/interventions_internals/index.html
+++ b/chromium/chrome/browser/resources/interventions_internals/index.html
@@ -26,8 +26,8 @@
         <span>Logs</span>
       </label>
       <label class="inactive-tab">
-        <input type="radio" id="blacklist-tab" name="tabs"
-            value="blacklist-status">
+        <input type="radio" id="blocklist-tab" name="tabs"
+            value="blocklist-status">
         <span>Blocklist Status</span>
       </label>
       <label class="inactive-tab">
@@ -74,26 +74,26 @@
       </table>
     </div>
 
-    <div class="tab-content" id="blacklist-status">
-      <div id="blacklist-ignored-status"></div>
-      <button id="ignore-blacklist-button" type="button">
+    <div class="tab-content" id="blocklist-status">
+      <div id="blocklist-ignored-status"></div>
+      <button id="ignore-blocklist-button" type="button">
         Ignore Blocklist
       </button>
-      <div id="user-blacklisted-status">
+      <div id="user-blocklisted-status">
         User blocklisted status:
-        <span id="user-blacklisted-status-value">N/A</span>
+        <span id="user-blocklisted-status-value">N/A</span>
       </div>
-      <div id="blacklist-cleared-status">
+      <div id="blocklist-cleared-status">
         Last blocklist cleared:
-        <span id="blacklist-last-cleared-time">N/A</span>
+        <span id="blocklist-last-cleared-time">N/A</span>
       </div>
 
-      <div id="blacklisted-hosts">
+      <div id="blocklisted-hosts">
         <div class="table-name">Blocklisted hosts</div>
-        <table id="blacklisted-hosts-table">
+        <table id="blocklisted-hosts-table">
           <tr>
-            <th id="blacklisted-host-header">Host</th>
-            <th id="blacklisted-time-header">Time</th>
+            <th id="blocklisted-host-header">Host</th>
+            <th id="blocklisted-time-header">Time</th>
           </tr>
         </table>
       </div>
diff --git a/chromium/chrome/browser/resources/interventions_internals/index.js b/chromium/chrome/browser/resources/interventions_internals/index.js
index 752d3913dac..d88edff3bf0 100644
--- a/chromium/chrome/browser/resources/interventions_internals/index.js
+++ b/chromium/chrome/browser/resources/interventions_internals/index.js
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 /** The columns that are used to find rows that contain the keyword. */
-const ENABLE_BLACKLIST_BUTTON = 'Enable Blacklist';
-const IGNORE_BLACKLIST_BUTTON = 'Ignore Blacklist';
-const IGNORE_BLACKLIST_MESSAGE = 'Blacklist decisions are ignored.';
+const ENABLE_BLOCKLIST_BUTTON = 'Enable Blocklist';
+const IGNORE_BLOCKLIST_BUTTON = 'Ignore Blocklist';
+const IGNORE_BLOCKLIST_MESSAGE = 'Blocklist decisions are ignored.';
 const URL_THRESHOLD = 40;  // Maximum URL length
 
 window.logTableMap = {};
@@ -469,59 +469,59 @@ InterventionsInternalPageImpl.prototype = {
   },
 
   /**
-   * Update new blacklisted host to the web page.
+   * Update new blocklisted host to the web page.
    *
    * @override
-   * @param {!string} host The blacklisted host.
-   * @param {number} time The time when the host was blacklisted in milliseconds
+   * @param {!string} host The blocklisted host.
+   * @param {number} time The time when the host was blocklisted in milliseconds
    * since Unix epoch.
    */
-  onBlacklistedHost(host, time) {
+  onBlocklistedHost(host, time) {
     const row = document.createElement('tr');
-    row.setAttribute('class', 'blacklisted-host-row');
+    row.setAttribute('class', 'blocklisted-host-row');
 
     const hostTd = document.createElement('td');
-    hostTd.setAttribute('class', 'host-blacklisted');
+    hostTd.setAttribute('class', 'host-blocklisted');
     hostTd.textContent = host;
     row.appendChild(hostTd);
 
     const timeTd = document.createElement('td');
-    timeTd.setAttribute('class', 'host-blacklisted-time');
+    timeTd.setAttribute('class', 'host-blocklisted-time');
     timeTd.textContent = getTimeFormat(time);
     row.appendChild(timeTd);
 
     // TODO(thanhdle): Insert row at correct index. crbug.com/776105.
-    $('blacklisted-hosts-table').appendChild(row);
+    $('blocklisted-hosts-table').appendChild(row);
   },
 
   /**
-   * Update to the page that the user blacklisted status has changed.
+   * Update to the page that the user blocklisted status has changed.
    *
    * @override
-   * @param {boolean} blacklisted The time of the event in milliseconds since
+   * @param {boolean} blocklisted The time of the event in milliseconds since
    * Unix epoch.
    */
-  onUserBlacklistedStatusChange(blacklisted) {
-    const userBlacklistedStatus = $('user-blacklisted-status-value');
-    userBlacklistedStatus.textContent =
-        (blacklisted ? 'Blacklisted' : 'Not blacklisted');
+  onUserBlocklistedStatusChange(blocklisted) {
+    const userBlocklistedStatus = $('user-blocklisted-status-value');
+    userBlocklistedStatus.textContent =
+        (blocklisted ? 'Blocklisted' : 'Not blocklisted');
   },
 
   /**
-   * Update the blacklist cleared status on the page.
+   * Update the blocklist cleared status on the page.
    *
    * @override
    * @param {number} time The time of the event in milliseconds since Unix
    * epoch.
    */
-  onBlacklistCleared(time) {
-    const blacklistClearedStatus = $('blacklist-last-cleared-time');
-    blacklistClearedStatus.textContent = getTimeFormat(time);
+  onBlocklistCleared(time) {
+    const blocklistClearedStatus = $('blocklist-last-cleared-time');
+    blocklistClearedStatus.textContent = getTimeFormat(time);
 
     // Remove hosts from table.
-    const blacklistedHostsTable = $('blacklisted-hosts-table');
-    for (let row = blacklistedHostsTable.rows.length - 1; row > 0; row--) {
-      blacklistedHostsTable.deleteRow(row);
+    const blocklistedHostsTable = $('blocklisted-hosts-table');
+    for (let row = blocklistedHostsTable.rows.length - 1; row > 0; row--) {
+      blocklistedHostsTable.deleteRow(row);
     }
 
     // Remove log message from logs table.
@@ -529,24 +529,24 @@ InterventionsInternalPageImpl.prototype = {
 
     // Log event message.
     insertMessageRowToMessageLogTable(
-        time, 'Blacklist', 'Blacklist Cleared', '' /* URL */, 0 /* pageId */);
+        time, 'Blocklist', 'Blocklist Cleared', '' /* URL */, 0 /* pageId */);
   },
 
   /**
-   * Update the page with the new value of ignored blacklist decision status.
+   * Update the page with the new value of ignored blocklist decision status.
    *
    * @override
-   * @param {boolean} ignored The new status of whether the previews blacklist
-   * decisions is blacklisted or not.
+   * @param {boolean} ignored The new status of whether the previews blocklist
+   * decisions is blocklisted or not.
    */
-  onIgnoreBlacklistDecisionStatusChanged(ignored) {
-    const ignoreButton = $('ignore-blacklist-button');
+  onIgnoreBlocklistDecisionStatusChanged(ignored) {
+    const ignoreButton = $('ignore-blocklist-button');
     ignoreButton.textContent =
-        ignored ? ENABLE_BLACKLIST_BUTTON : IGNORE_BLACKLIST_BUTTON;
+        ignored ? ENABLE_BLOCKLIST_BUTTON : IGNORE_BLOCKLIST_BUTTON;
 
-    // Update the status of blacklist ignored on the page.
-    $('blacklist-ignored-status').textContent =
-        ignored ? IGNORE_BLACKLIST_MESSAGE : '';
+    // Update the status of blocklist ignored on the page.
+    $('blocklist-ignored-status').textContent =
+        ignored ? IGNORE_BLOCKLIST_MESSAGE : '';
   },
 
   /**
@@ -601,12 +601,12 @@ cr.define('interventions_internals', () => {
     getPreviewsEnabled();
     getPreviewsFlagsDetails();
 
-    const ignoreButton = $('ignore-blacklist-button');
+    const ignoreButton = $('ignore-blocklist-button');
     ignoreButton.addEventListener('click', () => {
-      // Whether the blacklist is currently ignored.
-      const ignored = (ignoreButton.textContent == ENABLE_BLACKLIST_BUTTON);
+      // Whether the blocklist is currently ignored.
+      const ignored = (ignoreButton.textContent == ENABLE_BLOCKLIST_BUTTON);
       // Try to reverse the ignore status.
-      pageHandler.setIgnorePreviewsBlacklistDecision(!ignored);
+      pageHandler.setIgnorePreviewsBlocklistDecision(!ignored);
     });
   }