BASELINE: Update Chromium to 85.0.4183.14085-based

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

9 files changed, 1154 insertions, 275 deletions

diff --git a/chromium/chrome/test/data/BUILD.gn b/chromium/chrome/test/data/BUILD.gn
index 0f438fef66c..906b6ca837a 100644
--- a/chromium/chrome/test/data/BUILD.gn
+++ b/chromium/chrome/test/data/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//chrome/common/features.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
+import("//pdf/features.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 import("//tools/grit/grit_rule.gni")
 
@@ -33,6 +34,9 @@ mojom("web_ui_test_bindings") {
 
 group("closure_compile") {
   deps = [ ":closure_compile_local" ]
+  if (enable_pdf) {
+    deps += [ "pdf:closure_compile" ]
+  }
   if (!is_android) {
     deps += [ "webui:closure_compile" ]
   }
diff --git a/chromium/chrome/test/data/pdf/BUILD.gn b/chromium/chrome/test/data/pdf/BUILD.gn
new file mode 100644
index 00000000000..1fd45338182
--- /dev/null
+++ b/chromium/chrome/test/data/pdf/BUILD.gn
@@ -0,0 +1,23 @@
+# 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("//third_party/closure_compiler/compile_js.gni")
+
+js_type_check("closure_compile") {
+  is_polymer3 = true
+  closure_flags = default_closure_args + [
+                    "browser_resolver_prefix_replacements=\"chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/=../../chrome/browser/resources/pdf/\"",
+                    "js_module_root=../../chrome/test/data/webui/",
+                    "js_module_root=./gen/chrome/test/data/webui/",
+                  ]
+  deps = [ ":gesture_detector_test" ]
+}
+
+js_library("gesture_detector_test") {
+  deps = [
+    "//chrome/browser/resources/pdf:gesture_detector",
+    "//ui/webui/resources/js/cr:event_target.m",
+  ]
+  externs_list = [ "$externs_path/test.js" ]
+}
diff --git a/chromium/chrome/test/data/webui/BUILD.gn b/chromium/chrome/test/data/webui/BUILD.gn
index 49fffcbe9d8..479f59798b6 100644
--- a/chromium/chrome/test/data/webui/BUILD.gn
+++ b/chromium/chrome/test/data/webui/BUILD.gn
@@ -5,303 +5,317 @@
 import("//build/config/crypto.gni")
 import("//chrome/common/features.gni")
 import("//chrome/test/base/js2gtest.gni")
+import("//chrome/test/include_js_tests.gni")
 import("//third_party/closure_compiler/compile_js.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
 import("./namespace_rewrites.gni")
 
-js2gtest("interactive_ui_tests_js_webui") {
-  test_type = "webui"
+if (include_js_tests) {
+  js2gtest("interactive_ui_tests_js_webui") {
+    test_type = "webui"
 
-  sources = [
-    "bookmarks/bookmarks_focus_test.js",
-    "cr_elements/cr_elements_focus_test.js",
-    "cr_elements/cr_elements_v3_focus_test.js",
-    "cr_focus_outline_manager_test.js",
-    "cr_focus_row_behavior_interactive_test.js",
-    "cr_focus_row_behavior_v3_interactive_test.js",
-    "extensions/cr_extensions_interactive_ui_tests.js",
-    "history/history_focus_test.js",
-    "new_tab_page/new_tab_page_interactive_test.js",
-    "print_preview/print_preview_interactive_ui_tests.js",
-    "settings/cr_settings_v3_interactive_ui_tests.js",
-  ]
+    sources = [
+      "bookmarks/bookmarks_focus_test.js",
+      "cr_elements/cr_elements_focus_test.js",
+      "cr_elements/cr_elements_v3_focus_test.js",
+      "cr_focus_outline_manager_test.js",
+      "cr_focus_row_behavior_interactive_test.js",
+      "cr_focus_row_behavior_v3_interactive_test.js",
+      "extensions/cr_extensions_interactive_ui_tests.js",
+      "history/history_focus_test.js",
+      "new_tab_page/new_tab_page_interactive_test.js",
+      "print_preview/print_preview_interactive_ui_tests.js",
+      "settings/cr_settings_v3_interactive_ui_tests.js",
+    ]
 
-  gen_include_files = [
-    "polymer_browser_test_base.js",
-    "polymer_interactive_ui_test.js",
-  ]
+    gen_include_files = [
+      "polymer_browser_test_base.js",
+      "polymer_interactive_ui_test.js",
+    ]
 
-  deps = [
-    ":modulize",
-    "//chrome/browser/ui",
-  ]
-  data = [
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_action_menu_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_checkbox_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_expand_button_focus_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_icon_button_focus_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_input_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_profile_avatar_selector_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_tabs_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toggle_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/iron_list_focus_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_focus_row_behavior_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/mock_controller.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/sync_test_util.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/test_sync_browser_proxy.m.js",
-    "$root_gen_dir/chrome/test/data/webui/test_browser_proxy.m.js",
-    "$root_gen_dir/chrome/test/data/webui/test_store.m.js",
-    "$root_gen_dir/chrome/test/data/webui/test_util.m.js",
-  ]
-  defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
-}
+    deps = [
+      ":modulize",
+      "//chrome/browser/ui",
+    ]
+    data = [
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_action_menu_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_checkbox_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_expand_button_focus_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_icon_button_focus_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_input_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_profile_avatar_selector_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_tabs_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toggle_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/iron_list_focus_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_focus_row_behavior_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/mock_controller.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/sync_test_util.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/test_sync_browser_proxy.m.js",
+      "$root_gen_dir/chrome/test/data/webui/test_browser_proxy.m.js",
+      "$root_gen_dir/chrome/test/data/webui/test_store.m.js",
+      "$root_gen_dir/chrome/test/data/webui/test_util.m.js",
+    ]
+    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
+  }
 
-js2gtest("browser_tests_js_webui") {
-  test_type = "webui"
+  js2gtest("browser_tests_js_webui") {
+    test_type = "webui"
 
-  # Javascript sources. These are combined with the .cc files in the GYP build
-  # and are handled by a rule, but in the GN build they're in a separate
-  # action so need to be separated out.
-  sources = [
-    "../../../browser/ui/webui/identity_internals_ui_browsertest.js",
-    "../../../browser/ui/webui/sync_internals_browsertest.js",
-    "about_invalidations_browsertest.js",
-    "assertions.js",
-    "async_gen.js",
-    "bookmarks/bookmarks_browsertest.js",
-    "chrome_send_browsertest.js",
-    "cr_components/cr_components_browsertest.js",
-    "cr_components/cr_components_v3_browsertest.js",
-    "cr_elements/cr_elements_browsertest.js",
-    "cr_elements/cr_elements_v3_browsertest.js",
-    "find_shortcut_behavior_browsertest.js",
-    "find_shortcut_behavior_v3_browsertest.js",
-    "history/history_browsertest.js",
-    "js/webui_resource_module_async_browsertest.js",
-    "js2gtest_browsertest.js",
-    "load_time_data_browsertest.js",
-    "management/a11y/management_a11y_test.js",
-    "mock4js_browsertest.js",
-    "net_internals/chromeos_view.js",
-    "net_internals/dns_view.js",
-    "net_internals/domain_security_policy_view.js",
-    "net_internals/main.js",
-    "net_internals/net_internals_test.js",
-    "ntp4.js",
-    "resources/webui_resources_browsertest.js",
-    "resources/webui_resources_v3_browsertest.js",
-    "sandboxstatus_browsertest.js",
-    "settings/a11y/v3_a11y_browsertest.js",
-    "settings/cr_settings_v3_browsertest.js",
-    "settings/settings_idle_load_v3_browsertest.js",
-    "text_defaults_browsertest.js",
-    "webui_resource_async_browsertest.js",
-  ]
+    # Javascript sources. These are combined with the .cc files in the GYP build
+    # and are handled by a rule, but in the GN build they're in a separate
+    # action so need to be separated out.
+    sources = [
+      "../../../browser/ui/webui/identity_internals_ui_browsertest.js",
+      "../../../browser/ui/webui/sync_internals_browsertest.js",
+      "about_invalidations_browsertest.js",
+      "assertions.js",
+      "async_gen.js",
+      "bookmarks/bookmarks_browsertest.js",
+      "chrome_send_browsertest.js",
+      "cr_components/cr_components_browsertest.js",
+      "cr_components/cr_components_v3_browsertest.js",
+      "cr_elements/cr_elements_browsertest.js",
+      "cr_elements/cr_elements_v3_browsertest.js",
+      "find_shortcut_behavior_browsertest.js",
+      "find_shortcut_behavior_v3_browsertest.js",
+      "histograms/histograms_internals_ui_browsertest.js",
+      "history/history_browsertest.js",
+      "js/webui_resource_module_async_browsertest.js",
+      "js2gtest_browsertest.js",
+      "load_time_data_browsertest.js",
+      "management/a11y/management_a11y_test.js",
+      "mock4js_browsertest.js",
+      "net_internals/dns_view.js",
+      "net_internals/domain_security_policy_view.js",
+      "net_internals/main.js",
+      "net_internals/net_internals_test.js",
+      "ntp4.js",
+      "resources/webui_resources_browsertest.js",
+      "resources/webui_resources_v3_browsertest.js",
+      "sandboxstatus_browsertest.js",
+      "settings/a11y/v3_a11y_browsertest.js",
+      "settings/cr_settings_v3_browsertest.js",
+      "settings/settings_idle_load_v3_browsertest.js",
+      "text_defaults_browsertest.js",
+      "webui_resource_async_browsertest.js",
+    ]
 
-  gen_include_files = [
-    "a11y/accessibility_audit_rules.js",
-    "a11y/accessibility_test.js",
-    "polymer_browser_test_base.js",
-    "settings/a11y/settings_accessibility_v3_test.js",
-    "//third_party/axe-core/axe.js",
-  ]
+    gen_include_files = [
+      "a11y/accessibility_audit_rules.js",
+      "a11y/accessibility_test.js",
+      "polymer_browser_test_base.js",
+      "settings/a11y/settings_accessibility_v3_test.js",
+      "//third_party/axe-core/axe.js",
+    ]
 
-  if (is_chromeos) {
-    gen_include_files += [
-      "settings/chromeos/a11y/os_settings_accessibility_test.js",
-      "settings/chromeos/a11y/crostini_accessibility_test.js",
+    if (is_chromeos) {
+      gen_include_files += [
+        "settings/chromeos/a11y/os_settings_accessibility_test.js",
+        "settings/chromeos/a11y/crostini_accessibility_test.js",
+      ]
+    }
+
+    extra_js_files = [
+      "test_browser_proxy.js",
+      "settings/test_password_manager_proxy.js",
+      "settings/passwords_and_autofill_fake_data.js",
+      "//chrome/browser/resources/signin/sync_confirmation/sync_confirmation_browser_proxy.js",
     ]
-  }
 
-  extra_js_files = [
-    "test_browser_proxy.js",
-    "settings/test_password_manager_proxy.js",
-    "settings/passwords_and_autofill_fake_data.js",
-    "//chrome/browser/resources/signin/sync_confirmation/sync_confirmation_browser_proxy.js",
-    "//chrome/browser/ui/webui/chromeos/account_migration_proxy_test.js",
-  ]
+    if (is_chromeos) {
+      sources += [
+        "../../../browser/resources/chromeos/login/security_token_pin_browsertest.js",
+        "../../../browser/ui/webui/chromeos/bluetooth_pairing_dialog_browsertest.js",
+        "../../../browser/ui/webui/chromeos/certificate_manager_dialog_browsertest.js",
+        "../chromeos/oobe_webui_browsertest.js",
+        "chromeos/edu_login/edu_login_browsertest.js",
+        "set_time_dialog_browsertest.js",
+        "settings/chromeos/a11y/crostini_settings_details_a11y_test.js",
+        "settings/chromeos/a11y/crostini_settings_export_import_a11y_test.js",
+        "settings/chromeos/a11y/crostini_settings_shared_paths_a11y_test.js",
+        "settings/chromeos/a11y/crostini_settings_shared_usb_devices_a11y_test.js",
+        "settings/chromeos/a11y/crostini_settings_subpage_a11y_test.js",
+        "settings/chromeos/a11y/google_assistant_a11y_test.js",
+        "settings/chromeos/a11y/manage_accessibility_a11y_test.js",
+        "settings/chromeos/a11y/multidevice_a11y_test.js",
+        "settings/chromeos/a11y/multidevice_features_a11y_test.js",
+        "settings/chromeos/a11y/tts_subpage_a11y_test.js",
+        "settings/chromeos/os_settings_browsertest.js",
+        "settings/chromeos/os_settings_ui_browsertest.js",
+        "sys_internals/sys_internals_browsertest.js",
+      ]
+      if (!optimize_webui) {
+        sources += [ "settings/chromeos/os_settings_v3_browsertest.js" ]
+      }
+    } else {
+      sources += [
+        "signin/signin_browsertest.js",
+        "user_manager/user_manager_browsertest.js",
+        "welcome/a11y_tests.js",
+        "welcome/welcome_browsertest.js",
+      ]
+    }
 
-  if (is_chromeos) {
-    sources += [
-      "../../../browser/resources/chromeos/login/security_token_pin_browsertest.js",
-      "../../../browser/ui/webui/chromeos/account_migration_welcome_test.js",
-      "../../../browser/ui/webui/chromeos/bluetooth_pairing_dialog_browsertest.js",
-      "../../../browser/ui/webui/chromeos/certificate_manager_dialog_browsertest.js",
-      "../chromeos/oobe_webui_browsertest.js",
-      "chromeos/edu_login/edu_login_browsertest.js",
-      "set_time_dialog_browsertest.js",
-      "settings/chromeos/a11y/crostini_settings_details_a11y_test.js",
-      "settings/chromeos/a11y/crostini_settings_export_import_a11y_test.js",
-      "settings/chromeos/a11y/crostini_settings_shared_paths_a11y_test.js",
-      "settings/chromeos/a11y/crostini_settings_shared_usb_devices_a11y_test.js",
-      "settings/chromeos/a11y/crostini_settings_subpage_a11y_test.js",
-      "settings/chromeos/a11y/google_assistant_a11y_test.js",
-      "settings/chromeos/a11y/manage_accessibility_a11y_test.js",
-      "settings/chromeos/a11y/multidevice_a11y_test.js",
-      "settings/chromeos/a11y/multidevice_features_a11y_test.js",
-      "settings/chromeos/a11y/tts_subpage_a11y_test.js",
-      "settings/chromeos/os_settings_browsertest.js",
-      "settings/chromeos/os_settings_ui_browsertest.js",
-      "sys_internals/sys_internals_browsertest.js",
+    if (use_nss_certs) {
+      sources += [ "certificate_viewer_dialog_browsertest.js" ]
+    }
+    if (enable_extensions) {
+      sources += [
+        "extensions/a11y/extensions_a11y_test.js",
+        "extensions/cr_extensions_browsertest.js",
+      ]
+    }
+    if (enable_print_preview) {
+      sources += [ "print_preview/print_preview_ui_browsertest.js" ]
+    }
+    if (enable_webui_tab_strip) {
+      sources += [ "tab_strip/tab_strip_browsertest.js" ]
+    }
+    deps = [
+      ":modulize",
+      "//build:branding_buildflags",
+      "//chrome/browser/ui",
+      "//services/network/public/cpp",
+      "//skia",
     ]
-  } else {
-    sources += [
-      "signin/signin_browsertest.js",
-      "user_manager/user_manager_browsertest.js",
-      "welcome/a11y_tests.js",
-      "welcome/welcome_browsertest.js",
+    data = [
+      "$root_gen_dir/chrome/test/data/webui/cr_components/managed_footnote_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_button_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_container_shadow_behavior_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_dialog_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_drawer_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_expand_button_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_fingerprint_progress_arc_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_icon_button_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_lazy_render_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_link_row_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_lottie_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_policy_indicator_behavior_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_policy_indicator_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_policy_pref_indicator_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_radio_button_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_radio_group_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_search_field_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_scrollable_behavior_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_slider_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toast_manager_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toast_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toolbar_search_field_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_view_manager_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/fake_chrome_event.m.js",
+      "$root_gen_dir/chrome/test/data/webui/find_shortcut_behavior_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/mock_controller.m.js",
+      "$root_gen_dir/chrome/test/data/webui/mock_timer.m.js",
+      "$root_gen_dir/chrome/test/data/webui/resources/list_property_update_behavior_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/fake_input_method_private.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/fake_language_settings_private.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/fake_settings_private.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/pref_util_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/prefs_test_cases.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/prefs_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/settings_slider_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/settings_textarea_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/settings_toggle_button_tests.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/sync_test_util.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/test_languages_browser_proxy.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/test_lifetime_browser_proxy.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/test_profile_info_browser_proxy.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/test_search_engines_browser_proxy.m.js",
+      "$root_gen_dir/chrome/test/data/webui/settings/test_sync_browser_proxy.m.js",
+      "$root_gen_dir/chrome/test/data/webui/test_browser_proxy.m.js",
+      "$root_gen_dir/chrome/test/data/webui/test_store.m.js",
+      "$root_gen_dir/chrome/test/data/webui/test_util.m.js",
     ]
+    if (is_chromeos) {
+      data += [
+        "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_searchable_drop_down_tests.m.js",
+        "$root_gen_dir/chrome/test/data/webui/settings/chromeos/bluetooth_page_tests.m.js",
+        "$root_gen_dir/chrome/test/data/webui/settings/chromeos/fake_bluetooth_private.m.js",
+        "$root_gen_dir/chrome/test/data/webui/settings/chromeos/fake_bluetooth.m.js",
+        "$root_gen_dir/chrome/test/data/webui/settings/chromeos/localized_link_test.m.js",
+        "$root_gen_dir/chrome/test/data/webui/settings/chromeos/nearby_share_subpage_tests.m.js",
+        "$root_gen_dir/chrome/test/data/webui/settings/chromeos/os_reset_page_test.m.js",
+        "$root_gen_dir/chrome/test/data/webui/settings/chromeos/test_os_reset_browser_proxy.m.js",
+        "$root_gen_dir/chrome/test/data/webui/settings/chromeos/test_os_lifetime_browser_proxy.m.js",
+      ]
+    }
+    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
   }
 
-  if (use_nss_certs) {
-    sources += [ "certificate_viewer_dialog_browsertest.js" ]
-  }
-  if (enable_extensions) {
-    sources += [
-      "extensions/a11y/extensions_a11y_test.js",
-      "extensions/cr_extensions_browsertest.js",
+  js2gtest("browser_tests_js_mojo_lite_webui") {
+    test_type = "mojo_lite_webui"
+
+    sources = [
+      "bluetooth_internals_browsertest.js",
+      "downloads/downloads_browsertest.js",
+      "engagement/site_engagement_browsertest.js",
+      "interventions_internals_browsertest.js",
+      "media/media_engagement_browsertest.js",
+      "media/media_feeds_webui_browsertest.js",
+      "media/media_history_webui_browsertest.js",
+      "new_tab_page/new_tab_page_browsertest.js",
+      "usb_internals_browsertest.js",
     ]
-  }
-  if (enable_print_preview) {
-    sources += [ "print_preview/print_preview_ui_browsertest.js" ]
-  }
-  if (enable_webui_tab_strip) {
-    sources += [ "tab_strip/tab_strip_browsertest.js" ]
-  }
-  deps = [
-    ":modulize",
-    "//build:branding_buildflags",
-    "//chrome/browser/ui",
-    "//services/network/public/cpp",
-    "//skia",
-  ]
-  data = [
-    "$root_gen_dir/chrome/test/data/webui/cr_components/managed_footnote_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_button_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_container_shadow_behavior_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_dialog_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_drawer_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_expand_button_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_fingerprint_progress_arc_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_icon_button_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_lazy_render_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_link_row_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_lottie_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_policy_indicator_behavior_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_policy_indicator_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_policy_pref_indicator_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_radio_button_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_radio_group_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_search_field_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_scrollable_behavior_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_slider_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toast_manager_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toast_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toolbar_search_field_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_view_manager_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/fake_chrome_event.m.js",
-    "$root_gen_dir/chrome/test/data/webui/find_shortcut_behavior_test.m.js",
-    "$root_gen_dir/chrome/test/data/webui/mock_controller.m.js",
-    "$root_gen_dir/chrome/test/data/webui/mock_timer.m.js",
-    "$root_gen_dir/chrome/test/data/webui/resources/list_property_update_behavior_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/fake_input_method_private.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/fake_language_settings_private.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/fake_settings_private.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/pref_util_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/prefs_test_cases.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/prefs_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/settings_slider_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/settings_textarea_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/settings_toggle_button_tests.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/sync_test_util.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/test_languages_browser_proxy.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/test_lifetime_browser_proxy.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/test_profile_info_browser_proxy.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/test_search_engines_browser_proxy.m.js",
-    "$root_gen_dir/chrome/test/data/webui/settings/test_sync_browser_proxy.m.js",
-    "$root_gen_dir/chrome/test/data/webui/test_browser_proxy.m.js",
-    "$root_gen_dir/chrome/test/data/webui/test_store.m.js",
-    "$root_gen_dir/chrome/test/data/webui/test_util.m.js",
-  ]
-  if (is_chromeos) {
-    data += [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_searchable_drop_down_tests.m.js" ]
-  }
-  defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
-}
 
-js2gtest("browser_tests_js_mojo_lite_webui") {
-  test_type = "mojo_lite_webui"
+    deps = [ "//chrome/browser/ui" ]
 
-  sources = [
-    "bluetooth_internals_browsertest.js",
-    "downloads/downloads_browsertest.js",
-    "engagement/site_engagement_browsertest.js",
-    "interventions_internals_browsertest.js",
-    "media/media_engagement_browsertest.js",
-    "media/media_feeds_webui_browsertest.js",
-    "media/media_history_webui_browsertest.js",
-    "new_tab_page/new_tab_page_browsertest.js",
-    "usb_internals_browsertest.js",
-  ]
+    if (is_win || is_mac || is_desktop_linux || is_chromeos) {
+      sources += [ "discards/discards_browsertest.js" ]
+    }
 
-  deps = [ "//chrome/browser/ui" ]
+    if (is_chromeos) {
+      sources += [
+        "chromeos/crostini_installer_browsertest.js",
+        "chromeos/crostini_upgrader_browsertest.js",
+        "chromeos/machine_learning_internals_browsertest.js",
+        "chromeos/print_management/print_management_browsertest.js",
+        "chromeos/print_management/scanning_page_browsertest.js",
+        "multidevice_setup/multidevice_setup_browsertest.js",
+      ]
+      deps += [ "//chromeos/services/machine_learning/public/cpp:test_support" ]
+    }
 
-  if (is_win || is_mac || is_desktop_linux || is_chromeos) {
-    sources += [ "discards/discards_browsertest.js" ]
-  }
+    extra_js_files = [ "//chrome/browser/resources/downloads/constants.js" ]
 
-  if (is_chromeos) {
-    sources += [
-      "chromeos/crostini_installer_browsertest.js",
-      "chromeos/crostini_upgrader_browsertest.js",
-      "chromeos/machine_learning_internals_browsertest.js",
-      "chromeos/print_management/print_management_browsertest.js",
-      "chromeos/print_management/scanning_page_browsertest.js",
-      "multidevice_setup/multidevice_setup_browsertest.js",
-    ]
-    deps += [ "//chromeos/services/machine_learning/public/cpp:test_support" ]
+    defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
   }
 
-  extra_js_files = [ "//chrome/browser/resources/downloads/constants.js" ]
-
-  defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
-}
-
-js2gtest("unit_tests_js") {
-  test_type = "unit"
-  sources = [
-    "../../../renderer/resources/extensions/notifications_custom_bindings.gtestjs",
-    "../unit/framework_unittest.gtestjs",
-  ]
-  extra_js_files = [
-    "../../../browser/resources/downloads/browser_proxy.js",
-    "../../../browser/resources/downloads/search_service.js",
-    "../../../renderer/resources/extensions/notifications_custom_bindings.js",
-    "../../../renderer/resources/extensions/notifications_test_util.js",
-    "//ui/webui/resources/js/cr.js",
-  ]
-  if (is_chromeos) {
-    sources += [
-      "../../../browser/resources/chromeos/accessibility/braille_ime/braille_ime_unittest.js",
-      "../../../browser/resources/chromeos/accessibility/select_to_speak/node_utils_unittest.js",
-      "../../../browser/resources/chromeos/accessibility/select_to_speak/paragraph_utils_unittest.js",
-      "../../../browser/resources/chromeos/accessibility/select_to_speak/rect_utils_unittest.js",
-      "../../../browser/resources/chromeos/accessibility/select_to_speak/select_to_speak_unittest.js",
-      "../../../browser/resources/chromeos/accessibility/select_to_speak/word_utils_unittest.js",
-      "../../../browser/resources/chromeos/accessibility/switch_access/rect_helper_unittest.js",
-      "../../../browser/resources/chromeos/machine_learning/machine_learning_internals_utils_unittest.js",
+  js2gtest("unit_tests_js") {
+    test_type = "unit"
+    sources = [
+      "../../../renderer/resources/extensions/notifications_custom_bindings.gtestjs",
+      "../unit/framework_unittest.gtestjs",
     ]
-    extra_js_files += [
-      "../../../browser/resources/chromeos/accessibility/braille_ime/braille_ime.js",
-      "../../../browser/resources/chromeos/accessibility/select_to_speak/paragraph_utils.js",
-      "../../../browser/resources/chromeos/accessibility/select_to_speak/rect_utils.js",
-      "../../../browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.js",
-      "../../../browser/resources/chromeos/accessibility/select_to_speak/test_support.js",
-      "../../../browser/resources/chromeos/accessibility/select_to_speak/word_utils.js",
-      "../../../browser/resources/chromeos/accessibility/select_to_speak/node_utils.js",
-      "../../../browser/resources/chromeos/accessibility/switch_access/rect_helper.js",
-      "../../../browser/resources/chromeos/machine_learning/machine_learning_internals_utils.js",
+    extra_js_files = [
+      "../../../browser/resources/downloads/browser_proxy.js",
+      "../../../browser/resources/downloads/search_service.js",
+      "../../../renderer/resources/extensions/notifications_custom_bindings.js",
+      "../../../renderer/resources/extensions/notifications_test_util.js",
+      "//ui/webui/resources/js/cr.js",
     ]
+    if (is_chromeos) {
+      sources += [
+        "../../../browser/resources/chromeos/accessibility/braille_ime/braille_ime_unittest.js",
+        "../../../browser/resources/chromeos/accessibility/select_to_speak/node_utils_unittest.js",
+        "../../../browser/resources/chromeos/accessibility/select_to_speak/paragraph_utils_unittest.js",
+        "../../../browser/resources/chromeos/accessibility/select_to_speak/rect_utils_unittest.js",
+        "../../../browser/resources/chromeos/accessibility/select_to_speak/select_to_speak_unittest.js",
+        "../../../browser/resources/chromeos/accessibility/select_to_speak/word_utils_unittest.js",
+        "../../../browser/resources/chromeos/accessibility/switch_access/rect_helper_unittest.js",
+        "../../../browser/resources/chromeos/machine_learning/machine_learning_internals_utils_unittest.js",
+      ]
+      extra_js_files += [
+        "../../../browser/resources/chromeos/accessibility/braille_ime/braille_ime.js",
+        "../../../browser/resources/chromeos/accessibility/select_to_speak/paragraph_utils.js",
+        "../../../browser/resources/chromeos/accessibility/select_to_speak/rect_utils.js",
+        "../../../browser/resources/chromeos/accessibility/select_to_speak/select_to_speak.js",
+        "../../../browser/resources/chromeos/accessibility/select_to_speak/test_support.js",
+        "../../../browser/resources/chromeos/accessibility/select_to_speak/word_utils.js",
+        "../../../browser/resources/chromeos/accessibility/select_to_speak/node_utils.js",
+        "../../../browser/resources/chromeos/accessibility/switch_access/rect_helper.js",
+        "../../../browser/resources/chromeos/machine_learning/machine_learning_internals_utils.js",
+      ]
+    }
   }
 }
 
@@ -333,7 +347,10 @@ group("closure_compile") {
   deps = [
     ":closure_compile_local",
     "cr_components:closure_compile",
+    "cr_elements:closure_compile",
+    "print_preview:closure_compile",
     "settings:closure_compile",
+    "tab_strip:closure_compile",
 
     # TODO(crbug.com/1000989): Add page specific targets here.
   ]
@@ -341,18 +358,30 @@ group("closure_compile") {
 
 js_type_check("closure_compile_local") {
   is_polymer3 = true
+  closure_flags = default_closure_args + [
+                    "js_module_root=../../chrome/test/data/webui/",
+                    "js_module_root=./gen/chrome/test/data/webui/",
+                  ]
   deps = [
     ":chai_assert",
+    ":mock_timer.m",
     ":test_browser_proxy.m",
+    ":test_plural_string_proxy",
     ":test_util.m",
   ]
 }
 
+js_library("mock_timer.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/mock_timer.m.js" ]
+  extra_deps = [ ":modulize_local" ]
+}
+
 js_library("test_util.m") {
   sources = [ "$root_gen_dir/chrome/test/data/webui/test_util.m.js" ]
   deps = [
     ":chai_assert",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js/cr:event_target.m",
   ]
   extra_deps = [ ":modulize_local" ]
 }
@@ -366,3 +395,10 @@ js_library("test_browser_proxy.m") {
   deps = [ "//ui/webui/resources/js:promise_resolver.m" ]
   extra_deps = [ ":modulize_local" ]
 }
+
+js_library("test_plural_string_proxy") {
+  deps = [
+    ":test_browser_proxy.m",
+    "//ui/webui/resources/js:plural_string_proxy",
+  ]
+}
diff --git a/chromium/chrome/test/data/webui/cr_elements/BUILD.gn b/chromium/chrome/test/data/webui/cr_elements/BUILD.gn
index 4fd74afa75d..f8cee9f85dc 100644
--- a/chromium/chrome/test/data/webui/cr_elements/BUILD.gn
+++ b/chromium/chrome/test/data/webui/cr_elements/BUILD.gn
@@ -2,6 +2,7 @@
 # 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("//ui/webui/resources/tools/js_modulizer.gni")
 import("../namespace_rewrites.gni")
 
@@ -45,3 +46,416 @@ js_modulizer("modulize") {
     input_files += [ "cr_searchable_drop_down_tests.js" ]
   }
 }
+
+js_type_check("closure_compile") {
+  is_polymer3 = true
+
+  # TODO(crbug.com/1000989): Add JS type checking for all commented out targets.
+  deps = [
+    ":cr_action_menu_test.m",
+    ":cr_button_tests.m",
+    ":cr_checkbox_test.m",
+    ":cr_container_shadow_behavior_test.m",
+    ":cr_dialog_test.m",
+    ":cr_drawer_tests.m",
+    ":cr_expand_button_focus_tests.m",
+    ":cr_expand_button_tests.m",
+    ":cr_fingerprint_progress_arc_tests.m",
+    ":cr_icon_button_focus_tests.m",
+    ":cr_icon_button_tests.m",
+    ":cr_input_test.m",
+    ":cr_lazy_render_tests.m",
+    ":cr_link_row_tests.m",
+
+    #":cr_lottie_tests",
+
+    ":cr_policy_indicator_behavior_tests.m",
+    ":cr_policy_indicator_tests.m",
+    ":cr_policy_pref_indicator_tests.m",
+    ":cr_policy_strings",
+    ":cr_profile_avatar_selector_tests.m",
+    ":cr_radio_button_test.m",
+    ":cr_radio_group_test.m",
+    ":cr_scrollable_behavior_tests.m",
+    ":cr_search_field_tests.m",
+    ":cr_slider_test.m",
+    ":cr_splitter_test",
+    ":cr_tabs_test.m",
+    ":cr_toast_manager_test.m",
+    ":cr_toast_test.m",
+    ":cr_toggle_test.m",
+
+    #":cr_toolbar_search_field_tests",
+    #":cr_view_manager_test",
+    #":iron_list_focus_test",
+    #":settings_private_test_constants",
+  ]
+
+  if (is_chromeos) {
+    deps += [
+      #":cr_policy_network_behavior_mojo_tests",
+      #":cr_policy_network_indicator_mojo_tests",
+      #":cr_policy_network_indicator_tests",
+      #":cr_searchable_drop_down_tests",
+    ]
+  }
+}
+
+js_library("cr_action_menu_test.m") {
+  sources = [
+    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_action_menu_test.m.js",
+  ]
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-test-helpers:mock-interactions",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu.m",
+    "//ui/webui/resources/cr_elements/cr_checkbox:cr_checkbox.m",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:util.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_button_tests.m") {
+  sources = [
+    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_button_tests.m.js",
+  ]
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//ui/webui/resources/cr_elements/cr_button:cr_button.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_checkbox_test.m") {
+  sources = [
+    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_checkbox_test.m.js",
+  ]
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-test-helpers:mock-interactions",
+    "//ui/webui/resources/cr_elements/cr_checkbox:cr_checkbox.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_container_shadow_behavior_test.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_container_shadow_behavior_test.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements:cr_container_shadow_behavior.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_dialog_test.m") {
+  sources =
+      [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_dialog_test.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-test-helpers:mock-interactions",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_drawer_tests.m") {
+  sources = [
+    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_drawer_tests.m.js",
+  ]
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_drawer:cr_drawer.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_expand_button_focus_tests.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_expand_button_focus_tests.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-test-helpers:mock-interactions",
+    "//ui/webui/resources/cr_elements/cr_expand_button:cr_expand_button.m",
+    "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
+    "//ui/webui/resources/js:util.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_expand_button_tests.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_expand_button_tests.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "//ui/webui/resources/cr_elements/cr_expand_button:cr_expand_button.m",
+    "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_fingerprint_progress_arc_tests.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_fingerprint_progress_arc_tests.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_fingerprint:cr_fingerprint_progress_arc.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_icon_button_focus_tests.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_icon_button_focus_tests.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_icon_button_tests.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_icon_button_tests.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-test-helpers:mock-interactions",
+    "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_input_test.m") {
+  sources =
+      [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_input_test.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_input:cr_input.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_lazy_render_tests.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_lazy_render_tests.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_checkbox:cr_checkbox.m",
+    "//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_link_row_tests.m") {
+  sources = [
+    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_link_row_tests.m.js",
+  ]
+  deps = [
+    "..:chai_assert",
+    "//ui/webui/resources/cr_elements/cr_icon_button:cr_icon_button.m",
+    "//ui/webui/resources/cr_elements/cr_link_row:cr_link_row.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_policy_indicator_behavior_tests.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_policy_indicator_behavior_tests.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior.m",
+    "//ui/webui/resources/js:cr.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_policy_indicator_tests.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_policy_indicator_tests.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "//ui/webui/resources/cr_elements/policy:cr_policy_indicator.m",
+    "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior.m",
+    "//ui/webui/resources/cr_elements/policy:cr_tooltip_icon.m",
+    "//ui/webui/resources/js:cr.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_policy_pref_indicator_tests.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_policy_pref_indicator_tests.m.js" ]
+  deps = [
+    ":cr_policy_strings",
+    "..:chai_assert",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/policy:cr_policy_pref_indicator.m",
+    "//ui/webui/resources/cr_elements/policy:cr_tooltip_icon.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_policy_strings") {
+}
+
+js_library("cr_profile_avatar_selector_tests.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_profile_avatar_selector_tests.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "//third_party/polymer/v3_0/components-chromium/iron-test-helpers:mock-interactions",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_profile_avatar_selector:cr_profile_avatar_selector.m",
+    "//ui/webui/resources/js:util.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_radio_button_test.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_radio_button_test.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_radio_group_test.m") {
+  sources = [
+    "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_radio_group_test.m.js",
+  ]
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-test-helpers:mock-interactions",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button.m",
+    "//ui/webui/resources/cr_elements/cr_radio_group:cr_radio_group.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_scrollable_behavior_tests.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_scrollable_behavior_tests.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-list:iron-list",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements:cr_scrollable_behavior.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_search_field_tests.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_search_field_tests.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_slider_test.m") {
+  sources =
+      [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_slider_test.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-test-helpers:mock-interactions",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_slider:cr_slider.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_splitter_test") {
+  deps = [
+    "..:chai_assert",
+    "//ui/webui/resources/cr_elements/cr_splitter:cr_splitter",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
+js_library("cr_tabs_test.m") {
+  sources =
+      [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_tabs_test.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-test-helpers:mock-interactions",
+    "//ui/webui/resources/cr_elements/cr_tabs:cr_tabs.m",
+    "//ui/webui/resources/js:util.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_toast_manager_test.m") {
+  sources = [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toast_manager_test.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//ui/webui/resources/cr_elements/cr_toast:cr_toast.m",
+    "//ui/webui/resources/cr_elements/cr_toast:cr_toast_manager.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_toast_test.m") {
+  sources =
+      [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toast_test.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "..:mock_timer.m",
+    "//ui/webui/resources/cr_elements/cr_toast:cr_toast.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
+js_library("cr_toggle_test.m") {
+  sources =
+      [ "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toggle_test.m.js" ]
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-test-helpers:mock-interactions",
+    "//ui/webui/resources/cr_elements/cr_toggle:cr_toggle.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+  extra_deps = [ ":modulize" ]
+}
diff --git a/chromium/chrome/test/data/webui/print_preview/BUILD.gn b/chromium/chrome/test/data/webui/print_preview/BUILD.gn
new file mode 100644
index 00000000000..ad6477c31dc
--- /dev/null
+++ b/chromium/chrome/test/data/webui/print_preview/BUILD.gn
@@ -0,0 +1,220 @@
+# 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")
+
+js_type_check("closure_compile") {
+  is_polymer3 = true
+  closure_flags = default_closure_args + [
+                    "browser_resolver_prefix_replacements=\"chrome://print/=../../chrome/browser/resources/print_preview/\"",
+                    "js_module_root=../../chrome/test/data/webui/",
+                    "js_module_root=./gen/chrome/test/data/webui/",
+                  ]
+
+  # TODO(crbug.com/1000989): Add JS type checking for all commented out targets.
+  deps = [
+    ":advanced_dialog_test",
+    ":advanced_item_test",
+    ":button_strip_interactive_test",
+    ":button_strip_test",
+    ":cloud_print_interface_stub",
+    ":color_settings_test",
+    ":copies_settings_test",
+    ":custom_margins_test",
+
+    #":destination_dialog_interactive_test",
+    #":destination_dialog_test",
+    #":destination_item_test",
+    #":destination_list_test",
+    #":destination_search_test_chromeos",
+    #":destination_search_test",
+    #":destination_select_test",
+    ":destination_settings_test",
+
+    #":destination_store_test",
+    #":dpi_settings_test",
+    #":duplex_settings_test",
+    #":header_test",
+    #":invalid_settings_browsertest",
+    #":key_event_test",
+    #":layout_settings_test",
+    #":link_container_test",
+    #":margins_settings_test",
+    #":media_size_settings_test",
+    #":model_settings_availability_test",
+    #":model_settings_policy_test",
+    #":model_test",
+    ":native_layer_stub",
+
+    #":number_settings_section_interactive_test",
+    #":number_settings_section_test",
+    #":other_options_settings_test",
+    #":pages_per_sheet_settings_test",
+    #":pages_settings_test",
+    #":pdf_viewer_test",
+    #":pin_settings_test",
+    #":plugin_stub",
+    #":policy_test",
+    #":preview_area_test",
+    #":preview_generation_test",
+    #":print_button_test",
+    #":print_preview_app_test",
+    #":print_preview_sidebar_test",
+    ":print_preview_test_utils",
+
+    #":restore_state_test",
+    #":scaling_settings_interactive_test",
+    #":scaling_settings_test",
+    #":select_behavior_test",
+    #":settings_select_test",
+    #":system_dialog_browsertest",
+    #":user_manager_test",
+  ]
+
+  if (is_chromeos) {
+    deps += [
+      ":destination_dropdown_cros_test",
+      ":destination_select_test_cros",
+    ]
+  }
+}
+
+js_library("advanced_dialog_test") {
+  deps = [
+    ":print_preview_test_utils",
+    "..:chai_assert",
+    "..:test_util.m",
+    "//chrome/browser/resources/print_preview:print_preview",
+    "//ui/webui/resources/js:assert.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
+js_library("advanced_item_test") {
+  deps = [
+    ":print_preview_test_utils",
+    "..:chai_assert",
+    "..:test_util.m",
+    "//chrome/browser/resources/print_preview:print_preview",
+    "//ui/webui/resources/js:assert.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
+js_library("button_strip_test") {
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//chrome/browser/resources/print_preview:print_preview",
+    "//ui/webui/resources/js:assert.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
+js_library("button_strip_interactive_test") {
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//chrome/browser/resources/print_preview:print_preview",
+    "//ui/webui/resources/js:assert.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
+js_library("color_settings_test") {
+  deps = [
+    ":print_preview_test_utils",
+    "..:chai_assert",
+    "..:test_util.m",
+    "//chrome/browser/resources/print_preview:print_preview",
+    "//ui/webui/resources/js:assert.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
+js_library("copies_settings_test") {
+  deps = [
+    ":print_preview_test_utils",
+    "..:chai_assert",
+    "..:test_util.m",
+    "//chrome/browser/resources/print_preview:print_preview",
+    "//ui/webui/resources/js:assert.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
+js_library("custom_margins_test") {
+  deps = [
+    "..:chai_assert",
+    "..:test_util.m",
+    "//chrome/browser/resources/print_preview:print_preview",
+    "//ui/webui/resources/js:assert.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
+js_library("print_preview_test_utils") {
+  deps = [
+    "..:test_util.m",
+    "//chrome/browser/resources/print_preview:print_preview",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:load_time_data.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
+  ]
+}
+
+js_library("native_layer_stub") {
+  deps = [
+    ":print_preview_test_utils",
+    "..:test_browser_proxy.m",
+    "//chrome/browser/resources/print_preview:print_preview",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:promise_resolver.m",
+  ]
+}
+
+js_library("cloud_print_interface_stub") {
+  deps = [
+    ":print_preview_test_utils",
+    "..:test_browser_proxy.m",
+    "//chrome/browser/resources/print_preview:print_preview",
+  ]
+}
+
+js_library("destination_settings_test") {
+  deps = [
+    ":cloud_print_interface_stub",
+    ":native_layer_stub",
+    "..:chai_assert",
+    "..:test_util.m",
+    "//chrome/browser/resources/print_preview:print_preview",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:cr.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
+if (is_chromeos) {
+  js_library("destination_dropdown_cros_test") {
+    deps = [
+      ":print_preview_test_utils",
+      "..:chai_assert",
+      "//chrome/browser/resources/print_preview:print_preview",
+      "//ui/webui/resources/js:assert.m",
+    ]
+  }
+
+  js_library("destination_select_test_cros") {
+    deps = [
+      ":native_layer_stub",
+      ":print_preview_test_utils",
+      "..:chai_assert",
+      "..:test_util.m",
+      "//chrome/browser/resources/print_preview:print_preview",
+      "//ui/webui/resources/js:assert.m",
+    ]
+  }
+}
diff --git a/chromium/chrome/test/data/webui/settings/BUILD.gn b/chromium/chrome/test/data/webui/settings/BUILD.gn
index 4ba2e44a279..72df15e9aef 100644
--- a/chromium/chrome/test/data/webui/settings/BUILD.gn
+++ b/chromium/chrome/test/data/webui/settings/BUILD.gn
@@ -7,7 +7,15 @@ import("//third_party/closure_compiler/compile_js.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
 import("../namespace_rewrites.gni")
 
-js_modulizer("modulize") {
+group("modulize") {
+  public_deps = [ ":modulize_local" ]
+
+  if (is_chromeos) {
+    deps = [ "./chromeos:modulize" ]
+  }
+}
+
+js_modulizer("modulize_local") {
   input_files = [
     "fake_input_method_private.js",
     "fake_language_settings_private.js",
@@ -124,6 +132,8 @@ js_type_check("closure_compile") {
     #":reset_page_test",
     #":reset_profile_banner_test",
     #":route_tests",
+    ":safety_check_chrome_cleaner_test",
+    ":safety_check_page_branded_windows_test",
     ":safety_check_page_test",
 
     #":search_engines_page_test",
@@ -174,8 +184,6 @@ js_type_check("closure_compile") {
     ":test_metrics_browser_proxy",
     ":test_open_window_proxy",
     ":test_password_manager_proxy",
-
-    #":test_plural_string_proxy",
     ":test_privacy_page_browser_proxy",
 
     #":test_profile_info_browser_proxy",
@@ -229,6 +237,7 @@ js_library("passwords_and_autofill_fake_data") {
   deps = [
     "..:chai_assert",
     "//chrome/browser/resources/settings:lazy_load",
+    "//chrome/browser/resources/settings:settings",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
   externs_list = [
@@ -237,6 +246,24 @@ js_library("passwords_and_autofill_fake_data") {
   ]
 }
 
+js_library("safety_check_chrome_cleaner_test") {
+  deps = [
+    ":test_metrics_browser_proxy",
+    "..:chai_assert",
+    "//chrome/browser/resources/settings:settings",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
+js_library("safety_check_page_branded_windows_test") {
+  deps = [
+    "..:chai_assert",
+    "//chrome/browser/resources/settings:settings",
+    "//ui/webui/resources/js:load_time_data.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
 js_library("safety_check_page_test") {
   deps = [
     ":test_hats_browser_proxy",
@@ -349,7 +376,7 @@ js_library("test_about_page_browser_proxy") {
     "//chrome/browser/resources/settings:settings",
     "//ui/webui/resources/js:cr.m",
   ]
-  extra_deps = [ ":modulize" ]
+  extra_deps = [ ":modulize_local" ]
 }
 
 js_library("test_hats_browser_proxy") {
@@ -365,7 +392,7 @@ js_library("test_lifetime_browser_proxy.m") {
     "..:test_browser_proxy.m",
     "//chrome/browser/resources/settings:settings",
   ]
-  extra_deps = [ ":modulize" ]
+  extra_deps = [ ":modulize_local" ]
 }
 
 js_library("test_local_data_browser_proxy") {
@@ -381,7 +408,7 @@ js_library("test_search_engines_browser_proxy.m") {
     "..:test_browser_proxy.m",
     "//chrome/browser/resources/settings:settings",
   ]
-  extra_deps = [ ":modulize" ]
+  extra_deps = [ ":modulize_local" ]
 }
 
 js_library("test_site_settings_prefs_browser_proxy") {
diff --git a/chromium/chrome/test/data/webui/settings/chromeos/BUILD.gn b/chromium/chrome/test/data/webui/settings/chromeos/BUILD.gn
index 934c0a19357..5f41743076f 100644
--- a/chromium/chrome/test/data/webui/settings/chromeos/BUILD.gn
+++ b/chromium/chrome/test/data/webui/settings/chromeos/BUILD.gn
@@ -2,7 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//chrome/browser/resources/settings/chromeos/os_settings.gni")
 import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/polymer/polymer.gni")
+import("//ui/webui/resources/tools/js_modulizer.gni")
+import("./os_namespace_rewrites.gni")
 
 js_type_check("closure_compile") {
   deps = [
@@ -24,3 +28,20 @@ js_library("fake_settings_search_handler") {
     "//ui/webui/resources/js:cr",
   ]
 }
+
+js_modulizer("modulize") {
+  input_files = [
+    "bluetooth_page_tests.js",
+    "fake_bluetooth.js",
+    "fake_bluetooth_private.js",
+    "fake_settings_search_handler.js",
+    "fake_user_action_recorder.js",
+    "localized_link_test.js",
+    "nearby_share_subpage_tests.js",
+    "os_reset_page_test.js",
+    "test_os_reset_browser_proxy.js",
+    "test_os_lifetime_browser_proxy.js",
+  ]
+  namespace_rewrites =
+      os_settings_namespace_rewrites + os_test_namespace_rewrites
+}
diff --git a/chromium/chrome/test/data/webui/settings/chromeos/os_namespace_rewrites.gni b/chromium/chrome/test/data/webui/settings/chromeos/os_namespace_rewrites.gni
new file mode 100644
index 00000000000..16024f38589
--- /dev/null
+++ b/chromium/chrome/test/data/webui/settings/chromeos/os_namespace_rewrites.gni
@@ -0,0 +1,7 @@
+os_test_namespace_rewrites = [
+  "reset_page.TestOsResetBrowserProxy|TestOsResetBrowserProxy",
+  "settings.TestLifetimeBrowserProxy|TestLifetimeBrowserProxy",
+  "settings.FakeBluetooth|FakeBluetooth",
+  "settings.FakeBluetoothPrivate|FakeBluetoothPrivate",
+  "test_util.flushTasks|flushTasks",
+]
diff --git a/chromium/chrome/test/data/webui/tab_strip/BUILD.gn b/chromium/chrome/test/data/webui/tab_strip/BUILD.gn
new file mode 100644
index 00000000000..06f97065c13
--- /dev/null
+++ b/chromium/chrome/test/data/webui/tab_strip/BUILD.gn
@@ -0,0 +1,127 @@
+# 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("//third_party/closure_compiler/compile_js.gni")
+
+js_type_check("closure_compile") {
+  is_polymer3 = true
+  closure_flags = default_closure_args + [
+                    "browser_resolver_prefix_replacements=\"chrome://tab-strip/=../../chrome/browser/resources/tab-strip/\"",
+                    "js_module_root=../../chrome/test/data/webui/",
+                    "js_module_root=./gen/chrome/test/data/webui/",
+                  ]
+  deps = [
+    ":alert_indicator_test",
+    ":alert_indicators_test",
+    ":drag_manager_test",
+    ":tab_group_test",
+    ":tab_list_test",
+    ":tab_swiper_test",
+    ":tab_test",
+    ":test_tab_strip_embedder_proxy",
+    ":test_tabs_api_proxy",
+  ]
+}
+
+js_library("test_tab_strip_embedder_proxy") {
+  deps = [
+    "..:test_browser_proxy.m",
+    "//chrome/browser/resources/tab_strip:tab_strip_embedder_proxy",
+  ]
+}
+
+js_library("test_tabs_api_proxy") {
+  deps = [
+    "..:test_browser_proxy.m",
+    "//chrome/browser/resources/tab_strip:tabs_api_proxy",
+  ]
+}
+
+js_library("alert_indicator_test") {
+  deps = [
+    "..:chai_assert",
+    "//chrome/browser/resources/tab_strip:alert_indicator",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
+js_library("alert_indicators_test") {
+  deps = [
+    "..:chai_assert",
+    "//chrome/browser/resources/tab_strip:alert_indicator",
+    "//chrome/browser/resources/tab_strip:alert_indicators",
+    "//chrome/browser/resources/tab_strip:tabs_api_proxy",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
+js_library("drag_manager_test") {
+  deps = [
+    ":test_tabs_api_proxy",
+    "..:chai_assert",
+    "//chrome/browser/resources/tab_strip:drag_manager",
+    "//chrome/browser/resources/tab_strip:tab",
+    "//chrome/browser/resources/tab_strip:tab_group",
+    "//chrome/browser/resources/tab_strip:tabs_api_proxy",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:load_time_data.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
+js_library("tab_group_test") {
+  deps = [
+    ":test_tab_strip_embedder_proxy",
+    "..:chai_assert",
+    "//chrome/browser/resources/tab_strip:tab",
+    "//chrome/browser/resources/tab_strip:tab_group",
+    "//chrome/browser/resources/tab_strip:tab_strip_embedder_proxy",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
+js_library("tab_list_test") {
+  deps = [
+    ":test_tab_strip_embedder_proxy",
+    ":test_tabs_api_proxy",
+    "..:chai_assert",
+    "..:test_util.m",
+    "//chrome/browser/resources/tab_strip:tab",
+    "//chrome/browser/resources/tab_strip:tab_group",
+    "//chrome/browser/resources/tab_strip:tab_list",
+    "//chrome/browser/resources/tab_strip:tab_strip_embedder_proxy",
+    "//chrome/browser/resources/tab_strip:tabs_api_proxy",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:load_time_data.m",
+    "//ui/webui/resources/js/cr/ui:focus_outline_manager.m",
+  ]
+  externs_list = [
+    "$externs_path/mocha-2.5.js",
+    "$externs_path/pending.js",
+  ]
+}
+
+js_library("tab_swiper_test") {
+  deps = [
+    ":test_tabs_api_proxy",
+    "..:chai_assert",
+    "..:test_util.m",
+    "//chrome/browser/resources/tab_strip:tab_swiper",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
+js_library("tab_test") {
+  deps = [
+    ":test_tab_strip_embedder_proxy",
+    ":test_tabs_api_proxy",
+    "..:chai_assert",
+    "//chrome/browser/resources/tab_strip:tab",
+    "//chrome/browser/resources/tab_strip:tab_strip_embedder_proxy",
+    "//chrome/browser/resources/tab_strip:tabs_api_proxy",
+    "//ui/webui/resources/js:icon.m",
+    "//ui/webui/resources/js:load_time_data.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}