BASELINE: Update Chromium to 85.0.4183.14085-based

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

11 files changed, 271 insertions, 184 deletions

diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/BUILD.gn b/chromium/chrome/browser/resources/chromeos/accessibility/BUILD.gn
index 0f4967d66af..31961f1aae2 100644
--- a/chromium/chrome/browser/resources/chromeos/accessibility/BUILD.gn
+++ b/chromium/chrome/browser/resources/chromeos/accessibility/BUILD.gn
@@ -21,11 +21,13 @@ group("build") {
   ]
   if (is_chromeos) {
     deps += [
+      ":accessibility_common_guest_manifest",
+      ":accessibility_common_manifest",
       ":select_to_speak_guest_manifest",
       ":select_to_speak_manifest",
       ":switch_access_guest_manifest",
       ":switch_access_manifest",
-      "autoclick:build",
+      "accessibility_common:build",
       "select_to_speak:build",
       "switch_access:build",
     ]
@@ -58,6 +60,20 @@ template("manifest") {
   }
 }
 
+manifest("accessibility_common_manifest") {
+  input_file = "accessibility_common_manifest.json.jinja2"
+  output_file = "$accessibility_out_dir/accessibility_common_manifest.json"
+  key = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC6SX/t6kDEi9UiG4fULwjbEW1uJmQoiJPtxvSZ/SDH14OjSzmfP6xfE97Hus3EY8uSIMxTHkGaZliGbFbIQXQn6/XwBpQRu2gPlrfz7TWR1Hw6SboBBMOpltM9A2nx+d3jLtz+YtKNYVcHyNil9hXfFeyFe6g5kLHapKb1UO0jo3q3kovo1a1z7ujzGwogfLmb58w1hkdFBnnqumRlT55dKLN8AQ6cSdB1sjDVoMgPYeWgkzXr9cR3A8UVJookSO0sDAmD+W8BtBijapt3UVkHiIL1NTPuXvGGUHL7TPFo5WcBXFMkTz74gJqqFdO5hQ2YWXAaCxQJwgJrQPrvPMSJAgMBAAECggEADDhEDww9wWbWzUz3BQEs2In1HrOgAFStN3zEkNFc9B78AJsvpXWczgPUqk9jrg1JzkUeghlK/mDWT8MNkkdQ4kmFMYCM9/jOI6+kU3js+arxlzU84VI5r4c4RhlSOtBEMOHjF0DORP3sopMXOxPAbYjXog3xhA0szYXdedwcIik7Xu3lt1Hl5FfVZbvVLdf4vw0jTfHcp8SmHy/BDVnSCrhC3pnPGi6o+lUaSK0ca3uvcJDZGLXJ/6LyFb6uLlS2XUoBMYsombioRKrerJJSOmMTLHvfu1cM6+iQ+J0wdBnJQpgmDoSVGjnksPU2SMpWgG2OzwuZYIUGI745s19wLQKBgQDvdHsMZ4ttBr9bjydzeZVATWTICHZgXdAYgfgrbGwppYDUjfKoAuJ6bHTvff4nj8aZrY+Y1SwuvqxgHHfiggUgqg+JyeaAdQG+CLdfl1M8An+6H0x/hx0nk0oOJQhu0y1R/SbtnDJ6JASszg/VrTwHIYbzUl6xKHbZ6X41apyLYwKBgQDHKJOeZdxuYj7AsAqFGreuPoAEh0S+2VHHi4rjNz5dC1z7o/8siixfkHg7ONM2hqCKo55XYj4UWtprEFZJ9ohbizHELNzpnTxjdS0cG/VfItml6CDJaUtrkShIx17yGjNi0u/7ywHQ3slJsUXu7CbEcESwEzdoSrsC048dyxBSIwKBgF0141wtxklXcg/LBtldf6q7NbrkCGh0vDd+CEOm/eesRBz5cHbUQKLVKyO60L9HqVBTDm24tW0wzdrP2h7y69oOOOQzEqX4Zgg6Tl9IgZ7/fgbOfjG6P7ATFqWw5rp1O9QJjii6P6/p62P1Bpbvy0kfVO/MpY2iqbkjufxDFtLvAoGBAMC5p4CVGedH82oL8WI1JKLdoIzBSelV7CmqA9E1WIg5wtVRMlIrtB0WdQL6ToppZVpEU6pES8bu1Ibe3GHezL2pyZMJxw3bNuEYN3sIIz7ZPr2qEHBYEMAbTFyBcoPejvOHJO0I2s0BitBhWEeJB0r5Sb8KGYg3KRnnGIvAQh75AoGBANEC/k1umGrnMO3rwHJF7R+aTHzeMnO6oi11pmSnT7eJcF+oi7OwHS3ickU6sGrIb5QmnwCY9ES1qY6mP7N++KQGsdQM2l13MpCn8cBZgrfpQg2slP1dz8LCDW/PB+6MF7qwEHN2afVA2muQaez+q0eXZjMXmGJ3VZIXz/cxBLD6"
+}
+
+manifest("accessibility_common_guest_manifest") {
+  input_file = "accessibility_common_manifest.json.jinja2"
+  output_file =
+      "$accessibility_out_dir/accessibility_common_guest_manifest.json"
+  key = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC6SX/t6kDEi9UiG4fULwjbEW1uJmQoiJPtxvSZ/SDH14OjSzmfP6xfE97Hus3EY8uSIMxTHkGaZliGbFbIQXQn6/XwBpQRu2gPlrfz7TWR1Hw6SboBBMOpltM9A2nx+d3jLtz+YtKNYVcHyNil9hXfFeyFe6g5kLHapKb1UO0jo3q3kovo1a1z7ujzGwogfLmb58w1hkdFBnnqumRlT55dKLN8AQ6cSdB1sjDVoMgPYeWgkzXr9cR3A8UVJookSO0sDAmD+W8BtBijapt3UVkHiIL1NTPuXvGGUHL7TPFo5WcBXFMkTz74gJqqFdO5hQ2YWXAaCxQJwgJrQPrvPMSJAgMBAAECggEADDhEDww9wWbWzUz3BQEs2In1HrOgAFStN3zEkNFc9B78AJsvpXWczgPUqk9jrg1JzkUeghlK/mDWT8MNkkdQ4kmFMYCM9/jOI6+kU3js+arxlzU84VI5r4c4RhlSOtBEMOHjF0DORP3sopMXOxPAbYjXog3xhA0szYXdedwcIik7Xu3lt1Hl5FfVZbvVLdf4vw0jTfHcp8SmHy/BDVnSCrhC3pnPGi6o+lUaSK0ca3uvcJDZGLXJ/6LyFb6uLlS2XUoBMYsombioRKrerJJSOmMTLHvfu1cM6+iQ+J0wdBnJQpgmDoSVGjnksPU2SMpWgG2OzwuZYIUGI745s19wLQKBgQDvdHsMZ4ttBr9bjydzeZVATWTICHZgXdAYgfgrbGwppYDUjfKoAuJ6bHTvff4nj8aZrY+Y1SwuvqxgHHfiggUgqg+JyeaAdQG+CLdfl1M8An+6H0x/hx0nk0oOJQhu0y1R/SbtnDJ6JASszg/VrTwHIYbzUl6xKHbZ6X41apyLYwKBgQDHKJOeZdxuYj7AsAqFGreuPoAEh0S+2VHHi4rjNz5dC1z7o/8siixfkHg7ONM2hqCKo55XYj4UWtprEFZJ9ohbizHELNzpnTxjdS0cG/VfItml6CDJaUtrkShIx17yGjNi0u/7ywHQ3slJsUXu7CbEcESwEzdoSrsC048dyxBSIwKBgF0141wtxklXcg/LBtldf6q7NbrkCGh0vDd+CEOm/eesRBz5cHbUQKLVKyO60L9HqVBTDm24tW0wzdrP2h7y69oOOOQzEqX4Zgg6Tl9IgZ7/fgbOfjG6P7ATFqWw5rp1O9QJjii6P6/p62P1Bpbvy0kfVO/MpY2iqbkjufxDFtLvAoGBAMC5p4CVGedH82oL8WI1JKLdoIzBSelV7CmqA9E1WIg5wtVRMlIrtB0WdQL6ToppZVpEU6pES8bu1Ibe3GHezL2pyZMJxw3bNuEYN3sIIz7ZPr2qEHBYEMAbTFyBcoPejvOHJO0I2s0BitBhWEeJB0r5Sb8KGYg3KRnnGIvAQh75AoGBANEC/k1umGrnMO3rwHJF7R+aTHzeMnO6oi11pmSnT7eJcF+oi7OwHS3ickU6sGrIb5QmnwCY9ES1qY6mP7N++KQGsdQM2l13MpCn8cBZgrfpQg2slP1dz8LCDW/PB+6MF7qwEHN2afVA2muQaez+q0eXZjMXmGJ3VZIXz/cxBLD6"
+  is_guest_manifest = true
+}
+
 manifest("chromevox_manifest") {
   input_file = "chromevox_manifest.json.jinja2"
   output_file = "$accessibility_out_dir/chromevox_manifest.json"
@@ -105,7 +121,7 @@ group("browser_tests") {
   testonly = true
   if (is_chromeos) {
     deps = [
-      "autoclick:browser_tests",
+      "accessibility_common:browser_tests",
       "chromevox:browser_tests",
       "common:browser_tests",
       "select_to_speak:browser_tests",
diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/accessibility_common/BUILD.gn b/chromium/chrome/browser/resources/chromeos/accessibility/accessibility_common/BUILD.gn
new file mode 100644
index 00000000000..9cb8ce6e600
--- /dev/null
+++ b/chromium/chrome/browser/resources/chromeos/accessibility/accessibility_common/BUILD.gn
@@ -0,0 +1,87 @@
+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/features.gni")
+import(
+    "//chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni")
+import("//chrome/test/base/js2gtest.gni")
+import("//testing/test.gni")
+import("//third_party/closure_compiler/compile_js.gni")
+
+assert(is_chromeos)
+
+accessibility_common_dir =
+    "$root_out_dir/resources/chromeos/accessibility/accessibility_common"
+
+group("build") {
+  deps = [ ":accessibility_common_copied_files" ]
+}
+
+# Instead of setting up copy targets, use a script to copy all files.
+run_jsbundler("accessibility_common_copied_files") {
+  mode = "copy"
+  dest_dir = accessibility_common_dir
+  sources = [
+    "accessibility_common_loader.js",
+    "autoclick/autoclick.js",
+  ]
+  rewrite_rules = [
+    rebase_path(".", root_build_dir) + ":",
+    rebase_path(closure_library_dir, root_build_dir) + ":closure",
+  ]
+}
+
+source_set("browser_tests") {
+  testonly = true
+  assert(enable_extensions)
+
+  deps = [ ":accessibility_common_extjs_tests" ]
+
+  data = [
+    "$root_out_dir/chrome_100_percent.pak",
+    "$root_out_dir/chrome_200_percent.pak",
+    "$root_out_dir/locales/en-US.pak",
+    "$root_out_dir/resources.pak",
+    "$root_out_dir/resources/chromeos/accessibility/accessibility_common/",
+    "$root_out_dir/test_data/chrome/browser/resources/chromeos/accessibility/accessibility_common/",
+
+    # The test uses data from the original location, not the copied one.
+    "//chrome/browser/resources/chromeos/accessibility/accessibility_common/",
+    "//chrome/browser/resources/chromeos/accessibility/common/",
+    "//ui/webui/resources/js/cr.js",
+  ]
+  data += js2gtest_js_libraries
+}
+
+js2gtest("accessibility_common_extjs_tests") {
+  test_type = "extension"
+  sources = [ "autoclick_test.js" ]
+  gen_include_files = [
+    "../common/testing/callback_helper.js",
+    "mock_accessibility_private.js",
+  ]
+
+  # The test base classes generate C++ code with these deps.
+  deps = [
+    "//ash",
+    "//ash/keyboard/ui",
+    "//base",
+    "//chrome/browser/chromeos",
+    "//chrome/common",
+  ]
+  defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+}
+
+js_type_check("closure_compile") {
+  deps = [ ":accessibility_common" ]
+}
+
+js_library("accessibility_common") {
+  deps = []
+  externs_list = [
+    "$externs_path/accessibility_private.js",
+    "$externs_path/automation.js",
+    "$externs_path/accessibility_features.js",
+  ]
+}
diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/autoclick/BUILD.gn b/chromium/chrome/browser/resources/chromeos/accessibility/autoclick/BUILD.gn
deleted file mode 100644
index f4cc2e8b078..00000000000
--- a/chromium/chrome/browser/resources/chromeos/accessibility/autoclick/BUILD.gn
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/features.gni")
-import(
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni")
-import("//chrome/test/base/js2gtest.gni")
-import("//testing/test.gni")
-import("//third_party/closure_compiler/compile_js.gni")
-
-assert(is_chromeos)
-
-autoclick_dir = "$root_out_dir/resources/chromeos/accessibility/autoclick"
-
-group("build") {
-  deps = [
-    ":autoclick_copied_files",
-    ":autoclick_guest_manifest",
-    ":autoclick_manifest",
-  ]
-}
-
-# Instead of setting up copy targets, use a script to copy all files.
-run_jsbundler("autoclick_copied_files") {
-  mode = "copy"
-  dest_dir = autoclick_dir
-  sources = [ "autoclick.js" ]
-  rewrite_rules = [
-    rebase_path(".", root_build_dir) + ":",
-    rebase_path(closure_library_dir, root_build_dir) + ":closure",
-  ]
-}
-
-# TODO(crbug/978200): refactor this into another file like generate_manifest.gni
-# to share with other extensions.
-template("manifest") {
-  version_file = "//chrome/VERSION"
-  version_script = "//build/util/version.py"
-  template_file = "manifest.json.jinja2"
-  output_file = invoker.output_file
-  key = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC6SX/t6kDEi9UiG4fULwjbEW1uJmQoiJPtxvSZ/SDH14OjSzmfP6xfE97Hus3EY8uSIMxTHkGaZliGbFbIQXQn6/XwBpQRu2gPlrfz7TWR1Hw6SboBBMOpltM9A2nx+d3jLtz+YtKNYVcHyNil9hXfFeyFe6g5kLHapKb1UO0jo3q3kovo1a1z7ujzGwogfLmb58w1hkdFBnnqumRlT55dKLN8AQ6cSdB1sjDVoMgPYeWgkzXr9cR3A8UVJookSO0sDAmD+W8BtBijapt3UVkHiIL1NTPuXvGGUHL7TPFo5WcBXFMkTz74gJqqFdO5hQ2YWXAaCxQJwgJrQPrvPMSJAgMBAAECggEADDhEDww9wWbWzUz3BQEs2In1HrOgAFStN3zEkNFc9B78AJsvpXWczgPUqk9jrg1JzkUeghlK/mDWT8MNkkdQ4kmFMYCM9/jOI6+kU3js+arxlzU84VI5r4c4RhlSOtBEMOHjF0DORP3sopMXOxPAbYjXog3xhA0szYXdedwcIik7Xu3lt1Hl5FfVZbvVLdf4vw0jTfHcp8SmHy/BDVnSCrhC3pnPGi6o+lUaSK0ca3uvcJDZGLXJ/6LyFb6uLlS2XUoBMYsombioRKrerJJSOmMTLHvfu1cM6+iQ+J0wdBnJQpgmDoSVGjnksPU2SMpWgG2OzwuZYIUGI745s19wLQKBgQDvdHsMZ4ttBr9bjydzeZVATWTICHZgXdAYgfgrbGwppYDUjfKoAuJ6bHTvff4nj8aZrY+Y1SwuvqxgHHfiggUgqg+JyeaAdQG+CLdfl1M8An+6H0x/hx0nk0oOJQhu0y1R/SbtnDJ6JASszg/VrTwHIYbzUl6xKHbZ6X41apyLYwKBgQDHKJOeZdxuYj7AsAqFGreuPoAEh0S+2VHHi4rjNz5dC1z7o/8siixfkHg7ONM2hqCKo55XYj4UWtprEFZJ9ohbizHELNzpnTxjdS0cG/VfItml6CDJaUtrkShIx17yGjNi0u/7ywHQ3slJsUXu7CbEcESwEzdoSrsC048dyxBSIwKBgF0141wtxklXcg/LBtldf6q7NbrkCGh0vDd+CEOm/eesRBz5cHbUQKLVKyO60L9HqVBTDm24tW0wzdrP2h7y69oOOOQzEqX4Zgg6Tl9IgZ7/fgbOfjG6P7ATFqWw5rp1O9QJjii6P6/p62P1Bpbvy0kfVO/MpY2iqbkjufxDFtLvAoGBAMC5p4CVGedH82oL8WI1JKLdoIzBSelV7CmqA9E1WIg5wtVRMlIrtB0WdQL6ToppZVpEU6pES8bu1Ibe3GHezL2pyZMJxw3bNuEYN3sIIz7ZPr2qEHBYEMAbTFyBcoPejvOHJO0I2s0BitBhWEeJB0r5Sb8KGYg3KRnnGIvAQh75AoGBANEC/k1umGrnMO3rwHJF7R+aTHzeMnO6oi11pmSnT7eJcF+oi7OwHS3ickU6sGrIb5QmnwCY9ES1qY6mP7N++KQGsdQM2l13MpCn8cBZgrfpQg2slP1dz8LCDW/PB+6MF7qwEHN2afVA2muQaez+q0eXZjMXmGJ3VZIXz/cxBLD6"
-  action(target_name) {
-    script = "//chrome/browser/resources/chromeos/accessibility/chromevox/tools/generate_manifest.py"
-    inputs = [
-      version_file,
-      version_script,
-    ]
-    sources = [ template_file ]
-    outputs = [ output_file ]
-    args = [
-      "--key=$key",
-      "--version_file=" + rebase_path(version_file, root_build_dir),
-      "--output_manifest=" + rebase_path(output_file, root_build_dir),
-    ]
-    if (defined(invoker.is_guest_manifest) && invoker.is_guest_manifest) {
-      args += [ "--is_guest_manifest=1" ]
-    }
-    args += rebase_path(sources, root_build_dir)
-  }
-}
-
-manifest("autoclick_manifest") {
-  output_file = "$autoclick_dir/manifest.json"
-}
-
-manifest("autoclick_guest_manifest") {
-  output_file = "$autoclick_dir/manifest_guest.json"
-  is_guest_manifest = true
-}
-
-source_set("browser_tests") {
-  testonly = true
-  assert(enable_extensions)
-
-  deps = [ ":autoclick_extjs_tests" ]
-
-  data = [
-    "$root_out_dir/chrome_100_percent.pak",
-    "$root_out_dir/chrome_200_percent.pak",
-    "$root_out_dir/locales/en-US.pak",
-    "$root_out_dir/resources.pak",
-    "$root_out_dir/resources/chromeos/accessibility/autoclick/",
-    "$root_out_dir/test_data/chrome/browser/resources/chromeos/accessibility/autoclick/",
-
-    # The test uses data from the original location, not the copied one.
-    "//chrome/browser/resources/chromeos/accessibility/autoclick/",
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/",
-    "//ui/webui/resources/js/cr.js",
-  ]
-  data += js2gtest_js_libraries
-}
-
-js2gtest("autoclick_extjs_tests") {
-  test_type = "extension"
-  sources = [ "autoclick_test.js" ]
-  gen_include_files = [
-    "../chromevox/testing/callback_helper.js",
-    "mock_accessibility_private.js",
-  ]
-
-  # The test base classes generate C++ code with these deps.
-  deps = [
-    "//ash",
-    "//ash/keyboard/ui",
-    "//base",
-    "//chrome/browser/chromeos",
-    "//chrome/common",
-  ]
-  defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
-}
-
-js_type_check("closure_compile") {
-  deps = [ ":autoclick" ]
-}
-
-js_library("autoclick") {
-  deps = []
-  externs_list = [
-    "$externs_path/accessibility_private.js",
-    "$externs_path/automation.js",
-  ]
-}
diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/BUILD.gn b/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/BUILD.gn
index 7d16612e2df..4b6d105774b 100644
--- a/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/BUILD.gn
+++ b/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/BUILD.gn
@@ -3,11 +3,15 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
+import(
+    "//chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni")
 import("//chrome/common/features.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("//testing/test.gni")
 import("//third_party/closure_compiler/compile_js.gni")
-import("run_jsbundler.gni")
+
+# Prevent Chromium source assignment filters from being inherited.
+set_sources_assignment_filter([])
 
 declare_args() {
   # Whether to compress the main Chromevox javascript files or load the
@@ -135,12 +139,17 @@ relative_closure_library_modules = [
 closure_library_modules =
     rebase_path(relative_closure_library_modules, ".", closure_library_dir)
 
+chromevox_gen_dir =
+    "$root_gen_dir/chrome/browser/resources/chromeos/accessibility/chromevox"
+
 chromevox_out_dir = "$root_out_dir/resources/chromeos/accessibility/chromevox"
 
 group("build") {
   deps = [
     ":chromevox_copied_files",
     ":chromevox_phonetic_dictionaries_js",
+    ":lesson_component",
+    ":tutorial_component",
     "//chrome/browser/resources/chromeos/accessibility/braille_ime:braille_ime_manifest",
     "//third_party/chromevox:chromevox_third_party_resources",
     "//third_party/liblouis",
@@ -182,6 +191,11 @@ run_jsbundler("chromevox_copied_files") {
     "background/keymaps/default_keymap.json",
     "background/logging/log.css",
     "background/logging/log.html",
+    "i_tutorial/components/i_tutorial.js",
+    "i_tutorial/components/tutorial_lesson.js",
+    "i_tutorial/lessons/basic_navigation.html",
+    "i_tutorial/lessons/jump_commands.html",
+    "i_tutorial/lessons/text_fields.html",
     "images/chromevox-128.png",
     "images/chromevox-16.png",
     "images/chromevox-19.png",
@@ -387,8 +401,8 @@ if (is_chromeos) {
       "testing/mock_feedback_test.js",
     ]
     gen_include_files = [
-      "testing/assert_additions.js",
-      "testing/callback_helper.js",
+      "../common/testing/assert_additions.js",
+      "../common/testing/callback_helper.js",
       "testing/chromevox_unittest_base.js",
       "testing/mock_feedback.js",
     ]
@@ -426,8 +440,8 @@ if (is_chromeos) {
       "panel/panel_test.js",
     ]
     gen_include_files = [
-      "testing/assert_additions.js",
-      "testing/callback_helper.js",
+      "../common/testing/assert_additions.js",
+      "../common/testing/callback_helper.js",
       "testing/chromevox_e2e_test_base.js",
       "testing/chromevox_next_e2e_test_base.js",
       "testing/mock_feedback.js",
@@ -443,3 +457,22 @@ if (is_chromeos) {
     defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
   }
 }
+
+copy("lesson_component") {
+  sources = [ "$chromevox_gen_dir/i_tutorial/components/tutorial_lesson.js" ]
+  outputs = [ "$chromevox_out_dir/i_tutorial/tutorial_lesson.js" ]
+  deps = [
+    "i_tutorial/components:closure_compile",
+    "i_tutorial/components:components",
+  ]
+}
+
+copy("tutorial_component") {
+  sources = [ "$chromevox_gen_dir/i_tutorial/components/i_tutorial.js" ]
+  outputs = [ "$chromevox_out_dir/i_tutorial/i_tutorial.js" ]
+
+  deps = [
+    "i_tutorial/components:closure_compile",
+    "i_tutorial/components:components",
+  ]
+}
diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/i_tutorial/components/BUILD.gn b/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/i_tutorial/components/BUILD.gn
new file mode 100644
index 00000000000..679a3871583
--- /dev/null
+++ b/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/i_tutorial/components/BUILD.gn
@@ -0,0 +1,33 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/polymer/html_to_js.gni")
+
+html_to_js("components") {
+  js_files = [
+    "tutorial_lesson.js",
+    "i_tutorial.js",
+  ]
+}
+
+js_type_check("closure_compile") {
+  is_polymer3 = true
+  deps = [
+    ":i_tutorial",
+    ":tutorial_lesson",
+  ]
+}
+
+js_library("tutorial_lesson") {
+  deps = [
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+  ]
+}
+
+js_library("i_tutorial") {
+  deps = [
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+  ]
+}
diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/common/BUILD.gn b/chromium/chrome/browser/resources/chromeos/accessibility/common/BUILD.gn
index 8f6bb71d6e2..af38f4fb21f 100644
--- a/chromium/chrome/browser/resources/chromeos/accessibility/common/BUILD.gn
+++ b/chromium/chrome/browser/resources/chromeos/accessibility/common/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//build/config/features.gni")
 import(
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni")
+    "//chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni")
 import("//chrome/common/features.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("//testing/test.gni")
@@ -29,6 +29,7 @@ run_jsbundler("accessibility_common_copied_files") {
     "automation_util.js",
     "closure_shim.js",
     "constants.js",
+    "repeated_event_handler.js",
     "tree_walker.js",
   ]
   rewrite_rules = [ rebase_path(".", root_build_dir) + ":" ]
@@ -78,6 +79,10 @@ js_library("automation_util") {
   ]
 }
 
+js_library("repeated_event_handler") {
+  externs_list = [ "$externs_path/automation.js" ]
+}
+
 source_set("browser_tests") {
   testonly = true
   assert(enable_extensions)
@@ -108,15 +113,16 @@ js2gtest("accessibility_tests") {
   sources = [
     "array_util_test.js",
     "automation_util_test.js",
+    "repeated_event_handler_test.js",
     "tree_walker_test.js",
   ]
   gen_include_files = [
-    "../chromevox/testing/assert_additions.js",
-    "../chromevox/testing/callback_helper.js",
     "../chromevox/testing/chromevox_e2e_test_base.js",
     "../chromevox/testing/chromevox_next_e2e_test_base.js",
     "../chromevox/testing/mock_feedback.js",
     "array_util.js",
+    "testing/assert_additions.js",
+    "testing/callback_helper.js",
   ]
 
   if (is_chromeos) {
diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni b/chromium/chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni
index c68bb6df6fa..c68bb6df6fa 100644
--- a/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni
+++ b/chromium/chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni
diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/select_to_speak/BUILD.gn b/chromium/chrome/browser/resources/chromeos/accessibility/select_to_speak/BUILD.gn
index e2cf38296ad..63356e98621 100644
--- a/chromium/chrome/browser/resources/chromeos/accessibility/select_to_speak/BUILD.gn
+++ b/chromium/chrome/browser/resources/chromeos/accessibility/select_to_speak/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//build/config/features.gni")
 import(
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni")
+    "//chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni")
 import("//chrome/common/features.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("//testing/test.gni")
@@ -65,7 +65,7 @@ source_set("browser_tests") {
     "$root_out_dir/test_data/chrome/browser/resources/chromeos/accessibility/select_to_speak/",
 
     # The test uses data from the original location, not the copied one.
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/",
+    "//chrome/browser/resources/chromeos/accessibility/common/",
     "//chrome/browser/resources/chromeos/accessibility/select_to_speak/",
     "//ui/webui/resources/js/cr.js",
   ]
@@ -80,7 +80,7 @@ js2gtest("select_to_speak_extjs_tests") {
     "select_to_speak_prefs_test.js",
   ]
   gen_include_files = [
-    "../chromevox/testing/callback_helper.js",
+    "../common/testing/callback_helper.js",
     "mock_storage.js",
     "mock_tts.js",
     "select_to_speak_e2e_test_base.js",
diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/strings/chromevox_strings.grdp b/chromium/chrome/browser/resources/chromeos/accessibility/strings/chromevox_strings.grdp
index 75c816257cb..c7bf4b862b0 100644
--- a/chromium/chrome/browser/resources/chromeos/accessibility/strings/chromevox_strings.grdp
+++ b/chromium/chrome/browser/resources/chromeos/accessibility/strings/chromevox_strings.grdp
@@ -380,7 +380,10 @@
     Show Log
   </message>
   <message desc="Keyboard shortcut to show the ChromeVox log." name="IDS_CHROMEVOX_OPTIONS_SHOW_LOG_KEY">
-    Search + O + W
+    Search + O, then W
+  </message>
+  <message desc="Keyboard shortcut to show the TTS settings page." name="IDS_CHROMEVOX_OPTIONS_SHOW_TTS_SETTINGS">
+    Search + O, then S. Use to install, manage, and customize voices.
   </message>
   <message desc="Show event stream filters options for event stream logging." name="IDS_CHROMEVOX_OPTIONS_SHOW_EVENT_STREAM_FILTERS">
     Show event stream filters
@@ -2975,5 +2978,8 @@
   <message desc="Describes a gesture to be performed on a touch screen." name="IDS_CHROMEVOX_CLICK_GESTURE">
     Double tap with one finger
   </message>
+  <message desc="The text label for the use pitch changes checkbox." name="IDS_CHROMEVOX_OPTIONS_USE_PITCH_CHANGES_CHECKBOX_LABEL">
+    Change pitch when speaking element types and quoted, deleted, bolded, parenthesized, or capitalized text.
+  </message>
 
 </grit-part>
diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/strings/select_to_speak_strings.grdp b/chromium/chrome/browser/resources/chromeos/accessibility/strings/select_to_speak_strings.grdp
index fa31306e16b..58a65969ce8 100644
--- a/chromium/chrome/browser/resources/chromeos/accessibility/strings/select_to_speak_strings.grdp
+++ b/chromium/chrome/browser/resources/chromeos/accessibility/strings/select_to_speak_strings.grdp
@@ -45,6 +45,9 @@
 <message desc="Example of a word highlight on a light background in the Select-to-speak options dialog." name="IDS_SELECT_TO_SPEAK_OPTIONS_HIGHLIGHT_LIGHT">
   Light background
 </message>
+<message desc="Label for option to fade the background outside of the focus ring to improve focus on what is being spoken." name="IDS_SELECT_TO_SPEAK_OPTIONS_BACKGROUND_SHADING_DESCRIPTION">
+  Shade background content
+</message>
 <message desc="Link to the Text-to-Speech settings page." name="IDS_SELECT_TO_SPEAK_OPTIONS_TEXT_TO_SPEECH_SETTINGS">
   Personalize Text-to-Speech settings
 </message>
@@ -72,4 +75,7 @@
 <message desc="Description of a radio button that is selected" name="IDS_SELECT_TO_SPEAK_RADIOBUTTON_MIXED">
   partially selected
 </message>
+<message desc="Sample text around which will be drawn a Select to Speak visual preview. This should be less than one line long." name="IDS_SELECT_TO_SPEAK_OPTIONS_SAMPLE_TEXT">
+  The quick brown fox jumped over the lazy dog.
+</message>
 </grit-part>
diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/switch_access/BUILD.gn b/chromium/chrome/browser/resources/chromeos/accessibility/switch_access/BUILD.gn
index b930b96e57d..8f75b17ff43 100644
--- a/chromium/chrome/browser/resources/chromeos/accessibility/switch_access/BUILD.gn
+++ b/chromium/chrome/browser/resources/chromeos/accessibility/switch_access/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//build/config/features.gni")
 import(
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni")
+    "//chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni")
 import("//chrome/common/features.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("//testing/test.gni")
@@ -58,21 +58,20 @@ run_jsbundler("switch_access_copied_files") {
     "icons/textSelectionEnd.svg",
     "icons/textSelectionStart.svg",
     "menu_manager.js",
-    "menu_panel.css",
-    "menu_panel.html",
-    "menu_panel.js",
-    "menu_panel_interface.js",
     "metrics.js",
     "navigation_manager.js",
     "nodes/back_button_node.js",
+    "nodes/combo_box_node.js",
     "nodes/desktop_node.js",
     "nodes/editable_text_node.js",
     "nodes/group_node.js",
     "nodes/keyboard_node.js",
+    "nodes/modal_dialog_node.js",
     "nodes/node_wrapper.js",
+    "nodes/slider_node.js",
     "nodes/switch_access_node.js",
-    "nodes/system_menu_node.js",
     "nodes/tab_node.js",
+    "nodes/window_node.js",
     "preferences.js",
     "rect_helper.js",
     "switch_access.js",
@@ -93,7 +92,7 @@ source_set("browser_tests") {
   deps = [ ":switch_access_extjs_tests" ]
 
   data = [
-    "//chrome/browser/resources/chromeos/accessibility/chromevox/",
+    "//chrome/browser/resources/chromeos/accessibility/common/",
     "//chrome/browser/resources/chromeos/accessibility/switch_access/",
     "//ui/webui/resources/js/cr.js",
   ]
@@ -112,7 +111,8 @@ js2gtest("switch_access_extjs_tests") {
     "text_navigation_manager_test.js",
   ]
   gen_include_files = [
-    "../chromevox/testing/callback_helper.js",
+    "../common/testing/assert_additions.js",
+    "../common/testing/callback_helper.js",
     "switch_access_e2e_test_base.js",
   ]
 
@@ -133,6 +133,7 @@ js_type_check("closure_compile") {
     ":auto_scan_manager",
     ":back_button_node",
     ":background",
+    ":combo_box_node",
     ":commands",
     ":desktop_node",
     ":editable_text_node",
@@ -142,22 +143,24 @@ js_type_check("closure_compile") {
     ":history",
     ":keyboard_node",
     ":menu_manager",
-    ":menu_panel",
-    ":menu_panel_interface",
     ":metrics",
+    ":modal_dialog_node",
     ":navigation_manager",
     ":node_wrapper",
     ":preferences",
     ":rect_helper",
+    ":slider_node",
     ":switch_access",
     ":switch_access_constants",
     ":switch_access_node",
     ":switch_access_predicate",
-    ":system_menu_node",
     ":tab_node",
     ":text_navigation_manager",
+    ":window_node",
+    "../common:automation_predicate",
     "../common:closure_shim",
     "../common:constants",
+    "../common:repeated_event_handler",
     "../common:tree_walker",
   ]
 }
@@ -184,7 +187,22 @@ js_library("back_button_node") {
   ]
 }
 
+js_library("combo_box_node") {
+  sources = [ "nodes/combo_box_node.js" ]
+  deps = [
+    ":event_helper",
+    ":node_wrapper",
+    ":switch_access_constants",
+  ]
+  externs_list = []
+}
+
 js_library("commands") {
+  deps = [
+    ":auto_scan_manager",
+    ":menu_manager",
+    ":navigation_manager",
+  ]
   externs_list = [ "$externs_path/accessibility_private.js" ]
 }
 
@@ -213,8 +231,8 @@ js_library("event_helper") {
 
 js_library("focus_ring_manager") {
   deps = [
-    ":menu_panel_interface",
     ":node_wrapper",
+    ":switch_access_constants",
     ":switch_access_node",
   ]
   externs_list = [ "$externs_path/accessibility_private.js" ]
@@ -266,54 +284,46 @@ js_library("keyboard_node") {
 
 js_library("menu_manager") {
   deps = [
-    ":event_helper",
-    ":menu_panel_interface",
-    ":metrics",
-    ":node_wrapper",
-    ":rect_helper",
     ":switch_access_constants",
     ":switch_access_node",
-    ":switch_access_predicate",
-    ":text_navigation_manager",
-    "../common:constants",
-    "../common:tree_walker",
+    "../common:array_util",
   ]
   externs_list = [
     "$externs_path/accessibility_private.js",
     "$externs_path/automation.js",
-    "$externs_path/clipboard.js",
   ]
 }
 
-js_library("menu_panel") {
-  deps = [
-    ":menu_manager",
-    ":switch_access_constants",
-  ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
-}
-
-js_library("menu_panel_interface") {
-}
-
 js_library("metrics") {
   deps = [ ":switch_access_constants" ]
   externs_list = [ "$externs_path/metrics_private.js" ]
 }
 
+js_library("modal_dialog_node") {
+  sources = [ "nodes/modal_dialog_node.js" ]
+  deps = [
+    ":event_helper",
+    ":node_wrapper",
+    ":switch_access_constants",
+    ":switch_access_node",
+  ]
+  externs_list = [ "$externs_path/automation.js" ]
+}
+
 js_library("navigation_manager") {
   deps = [
     ":desktop_node",
     ":focus_ring_manager",
+    ":history",
     ":keyboard_node",
     ":menu_manager",
-    ":menu_panel_interface",
     ":metrics",
+    ":modal_dialog_node",
     ":node_wrapper",
     ":switch_access_constants",
     ":switch_access_node",
     ":switch_access_predicate",
-    ":system_menu_node",
+    "../common:repeated_event_handler",
   ]
   externs_list = [
     "$externs_path/accessibility_private.js",
@@ -328,7 +338,9 @@ js_library("node_wrapper") {
     ":switch_access_constants",
     ":switch_access_node",
     ":switch_access_predicate",
+    "../common:automation_predicate",
     "../common:constants",
+    "../common:repeated_event_handler",
     "../common:tree_walker",
   ]
   externs_list = [
@@ -346,12 +358,21 @@ js_library("rect_helper") {
   externs_list = [ "$externs_path/accessibility_private.js" ]
 }
 
+js_library("slider_node") {
+  sources = [ "nodes/slider_node.js" ]
+  deps = [
+    ":event_helper",
+    ":node_wrapper",
+    ":switch_access_constants",
+  ]
+  externs_list = [ "$externs_path/automation.js" ]
+}
+
 js_library("switch_access") {
   deps = [
     ":auto_scan_manager",
     ":commands",
     ":menu_manager",
-    ":menu_panel_interface",
     ":navigation_manager",
     ":preferences",
     ":switch_access_constants",
@@ -362,6 +383,7 @@ js_library("switch_access") {
     "$externs_path/automation.js",
     "$externs_path/command_line_private.js",
     "$externs_path/metrics_private.js",
+    "$externs_path/virtual_keyboard_private.js",
   ]
 }
 
@@ -381,17 +403,7 @@ js_library("switch_access_predicate") {
   deps = [
     ":switch_access_constants",
     ":switch_access_node",
-  ]
-  externs_list = [ "$externs_path/automation.js" ]
-}
-
-js_library("system_menu_node") {
-  sources = [ "nodes/system_menu_node.js" ]
-  deps = [
-    ":event_helper",
-    ":node_wrapper",
-    ":switch_access_constants",
-    ":switch_access_node",
+    "../common:automation_predicate",
   ]
   externs_list = [ "$externs_path/automation.js" ]
 }
@@ -412,5 +424,16 @@ js_library("text_navigation_manager") {
   externs_list = [
     "$externs_path/accessibility_private.js",
     "$externs_path/automation.js",
+    "$externs_path/clipboard.js",
   ]
 }
+
+js_library("window_node") {
+  sources = [ "nodes/window_node.js" ]
+  deps = [
+    ":node_wrapper",
+    ":switch_access_constants",
+    ":switch_access_node",
+  ]
+  externs_list = [ "$externs_path/automation.js" ]
+}