BASELINE: Update Chromium to 85.0.4183.14085-based

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

10 files changed, 24 insertions, 32 deletions

diff --git a/chromium/chrome/browser/resources/bookmarks/BUILD.gn b/chromium/chrome/browser/resources/bookmarks/BUILD.gn
index 3c241d44826..d85d90a82aa 100644
--- a/chromium/chrome/browser/resources/bookmarks/BUILD.gn
+++ b/chromium/chrome/browser/resources/bookmarks/BUILD.gn
@@ -101,7 +101,8 @@ js_library("actions") {
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js/cr/ui:store.m",
   ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
+
+  externs_list = [ "$externs_path/bookmarks.js" ]
 }
 
 js_library("api_listener") {
@@ -115,7 +116,8 @@ js_library("api_listener") {
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js/cr/ui:store.m",
   ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
+
+  externs_list = [ "$externs_path/bookmarks.js" ]
 }
 
 js_library("app") {
@@ -131,7 +133,10 @@ js_library("app") {
     "//ui/webui/resources/js:find_shortcut_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
+  externs_list = [
+    "$externs_path/bookmarks.js",
+    "$externs_path/metrics_private.js",
+  ]
 }
 
 js_library("browser_proxy") {
@@ -160,7 +165,10 @@ js_library("command_manager") {
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js/cr/ui:keyboard_shortcut_list.m",
   ]
-  externs_list = [ "$externs_path/bookmark_manager_private.js" ]
+  externs_list = chrome_extension_public_externs + [
+                   "$externs_path/bookmark_manager_private.js",
+                   "$externs_path/bookmarks.js",
+                 ]
 }
 
 js_library("constants") {
@@ -203,7 +211,7 @@ js_library("edit_dialog") {
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
+  externs_list = [ "$externs_path/bookmarks.js" ]
 }
 
 js_library("folder_node") {
@@ -216,7 +224,6 @@ js_library("folder_node") {
     ":util",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
 }
 
 js_library("item") {
@@ -233,7 +240,6 @@ js_library("item") {
     "//ui/webui/resources/js:icon.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
 }
 
 js_library("list") {
@@ -281,7 +287,6 @@ js_library("store") {
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js/cr/ui:store.m",
   ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
 }
 
 js_library("store_client") {
@@ -306,18 +311,15 @@ js_library("toolbar") {
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  externs_list = [
-    "$externs_path/bookmark_manager_private.js",
-    "$externs_path/chrome_extensions.js",
-  ]
 }
 
 js_library("types") {
   deps = [ ":constants" ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
+  externs_list = [ "$externs_path/bookmarks.js" ]
 }
 
 js_library("util") {
   deps = [ ":types" ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
+
+  externs_list = [ "$externs_path/bookmarks.js" ]
 }
diff --git a/chromium/chrome/browser/resources/bookmarks/actions.js b/chromium/chrome/browser/resources/bookmarks/actions.js
index 54cfd79207a..a45cd123429 100644
--- a/chromium/chrome/browser/resources/bookmarks/actions.js
+++ b/chromium/chrome/browser/resources/bookmarks/actions.js
@@ -16,7 +16,7 @@ import {getDescendants, getDisplayedList, normalizeNode} from './util.js';
 
 /**
  * @param {string} id
- * @param {BookmarkTreeNode} treeNode
+ * @param {chrome.bookmarks.BookmarkTreeNode} treeNode
  */
 export function createBookmark(id, treeNode) {
   return {
diff --git a/chromium/chrome/browser/resources/bookmarks/api_listener.js b/chromium/chrome/browser/resources/bookmarks/api_listener.js
index bc6b075f315..13723908914 100644
--- a/chromium/chrome/browser/resources/bookmarks/api_listener.js
+++ b/chromium/chrome/browser/resources/bookmarks/api_listener.js
@@ -89,7 +89,7 @@ function onBookmarkChanged(id, changeInfo) {
 
 /**
  * @param {string} id
- * @param {BookmarkTreeNode} treeNode
+ * @param {chrome.bookmarks.BookmarkTreeNode} treeNode
  */
 function onBookmarkCreated(id, treeNode) {
   batchUIUpdates();
diff --git a/chromium/chrome/browser/resources/bookmarks/bookmarks.html b/chromium/chrome/browser/resources/bookmarks/bookmarks.html
index 5869e33b5cb..2b1fee2c9f2 100644
--- a/chromium/chrome/browser/resources/bookmarks/bookmarks.html
+++ b/chromium/chrome/browser/resources/bookmarks/bookmarks.html
@@ -1,6 +1,5 @@
 <!doctype html>
-<html dir="$i18n{textdirection}" lang="$i18n{language}" class="loading"
-    $i18n{a11yenhanced}>
+<html dir="$i18n{textdirection}" lang="$i18n{language}" class="loading">
 <head>
   <meta charset="utf8">
   <base href="chrome://bookmarks">
diff --git a/chromium/chrome/browser/resources/bookmarks/bookmarks_resources_vulcanized.grd b/chromium/chrome/browser/resources/bookmarks/bookmarks_resources_vulcanized.grd
index b6881426042..8bca4369677 100644
--- a/chromium/chrome/browser/resources/bookmarks/bookmarks_resources_vulcanized.grd
+++ b/chromium/chrome/browser/resources/bookmarks/bookmarks_resources_vulcanized.grd
@@ -14,14 +14,12 @@
     <includes>
       <include name="IDR_BOOKMARKS_BOOKMARKS_HTML"
                file="bookmarks.html"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
       <include name="IDR_BOOKMARKS_BOOKMARKS_ROLLUP_JS"
                file="${root_gen_dir}\chrome\browser\resources\bookmarks\bookmarks.rollup.js"
                use_base_dir="false"
                preprocess="true"
-               type="chrome_html"
-               compress="gzip" />
+               type="chrome_html" />
     </includes>
   </release>
 </grit>
diff --git a/chromium/chrome/browser/resources/bookmarks/command_manager.js b/chromium/chrome/browser/resources/bookmarks/command_manager.js
index 0326cdaa772..67e6e6a9645 100644
--- a/chromium/chrome/browser/resources/bookmarks/command_manager.js
+++ b/chromium/chrome/browser/resources/bookmarks/command_manager.js
@@ -471,8 +471,6 @@ export const CommandManager = Polymer({
       if (shortcut.matchesEvent(e) && this.canExecute(command, itemIds)) {
         this.handle(command, itemIds);
 
-        this.recordCommandHistogram_(
-            itemIds, 'BookmarkManager.CommandExecutedFromKeyboard', command);
         e.stopPropagation();
         e.preventDefault();
         return true;
diff --git a/chromium/chrome/browser/resources/bookmarks/item.html b/chromium/chrome/browser/resources/bookmarks/item.html
index def6e11eb28..f65015195ed 100644
--- a/chromium/chrome/browser/resources/bookmarks/item.html
+++ b/chromium/chrome/browser/resources/bookmarks/item.html
@@ -15,10 +15,6 @@
     background-color: var(--highlight-color);
   }
 
-  :host([is-selected-item_]) cr-icon-button {
-    --cr-icon-button-fill-color-focus: var(--highlight-color);
-  }
-
   @media (prefers-color-scheme: dark) {
     :host([is-selected-item_]),
     :host([is-selected-item_]) .folder-icon {
diff --git a/chromium/chrome/browser/resources/bookmarks/toolbar.html b/chromium/chrome/browser/resources/bookmarks/toolbar.html
index 1f85ea820e2..764da792202 100644
--- a/chromium/chrome/browser/resources/bookmarks/toolbar.html
+++ b/chromium/chrome/browser/resources/bookmarks/toolbar.html
@@ -10,7 +10,6 @@
   }
 
   cr-icon-button {
-    --cr-icon-button-fill-color-focus: var(--cr-toolbar-background-color);
     justify-content: flex-end;
     margin: 4px;
   }
diff --git a/chromium/chrome/browser/resources/bookmarks/types.js b/chromium/chrome/browser/resources/bookmarks/types.js
index 1487eae9fb5..0031ae7c6c7 100644
--- a/chromium/chrome/browser/resources/bookmarks/types.js
+++ b/chromium/chrome/browser/resources/bookmarks/types.js
@@ -97,7 +97,7 @@ export class BookmarkElement extends HTMLElement {
 
 export class DragData {
   constructor() {
-    /** @type {Array<BookmarkTreeNode>} */
+    /** @type {Array<chrome.bookmarks.BookmarkTreeNode>} */
     this.elements = null;
 
     /** @type {boolean} */
diff --git a/chromium/chrome/browser/resources/bookmarks/util.js b/chromium/chrome/browser/resources/bookmarks/util.js
index cbe9aa0c072..b0e1184e4d4 100644
--- a/chromium/chrome/browser/resources/bookmarks/util.js
+++ b/chromium/chrome/browser/resources/bookmarks/util.js
@@ -26,7 +26,7 @@ export function getDisplayedList(state) {
 }
 
 /**
- * @param {BookmarkTreeNode} treeNode
+ * @param {chrome.bookmarks.BookmarkTreeNode} treeNode
  * @return {!BookmarkNode}
  */
 export function normalizeNode(treeNode) {
@@ -46,7 +46,7 @@ export function normalizeNode(treeNode) {
 }
 
 /**
- * @param {BookmarkTreeNode} rootNode
+ * @param {chrome.bookmarks.BookmarkTreeNode} rootNode
  * @return {NodeMap}
  */
 export function normalizeNodes(rootNode) {