Settings: Add more common files in the Polymer 3 build.

Specifically adding the following to settings_resources_v3.grdp
 - global_scroll_target_behavior.js
 - page_visibility.js
 - route.js
 - settings_routes.js
 - site_favicon.js (also port tests and add type-checking)

Bug: 1026426
Change-Id: I921ede15bc636b1b1ba3457cfd1cb3a3ec06a379
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036276
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738056}

chrome/browser/resources/settings/BUILD.gn

@@ -235,8 +235,7 @@ js_type_check("closure_compile_local_module") {
 
     #":search_settings.m",
     ":settings_routes.m",
-
-    #":site_favicon.m",
+    ":site_favicon.m",
   ]
 }
 
@@ -339,7 +338,8 @@ js_library("site_favicon.m") {
   sources =
       [ "$root_gen_dir/chrome/browser/resources/settings/site_favicon.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:icon.m",
   ]
   extra_deps = [ ":site_favicon_module" ]
 }
@@ -414,6 +414,8 @@ polymer_modulizer("site_favicon") {
   js_file = "site_favicon.js"
   html_file = "site_favicon.html"
   html_type = "dom-module"
+  auto_imports =
+      [ "ui/webui/resources/html/icon.html|getFavicon,getFaviconForPageURL" ]
 }
 
 js_modulizer("modulize") {

chrome/browser/resources/settings/settings.js

@@ -10,6 +10,7 @@ import './controls/settings_dropdown_menu.m.js';
 import './controls/settings_slider.m.js';
 import './controls/settings_textarea.m.js';
 import './controls/settings_toggle_button.m.js';
+import './site_favicon.m.js';
 
 export {ExtensionControlBrowserProxyImpl} from './extension_control_browser_proxy.m.js';
 export {prefToString, stringToPrefValue} from './prefs/pref_util.m.js';

chrome/browser/resources/settings/settings_resources_v3.grdp

@@ -53,9 +53,17 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/extension_control_browser_proxy.m.js"
            use_base_dir="false"
            type="BINDATA" />
+  <include name="IDR_SETTINGS_GLOBAL_SCROLL_TARGET_BEHAVIOR_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/global_scroll_target_behavior.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_I18N_SETUP_M_JS"
            file="i18n_setup.m.js"
            type="BINDATA" />
+  <include name="IDR_SETTINGS_PAGE_VISIBILITY_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/page_visibility.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PREFS_PREFS_TYPES_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/prefs/prefs_types.m.js"
            use_base_dir="false"
@@ -64,6 +72,11 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/prefs/pref_util.m.js"
            use_base_dir="false"
            type="BINDATA" />
+  <include name="IDR_SETTINGS_ROUTE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/route.m.js"
+           use_base_dir="false"
+           preprocess="true"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_ROUTER_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/router.m.js"
            use_base_dir="false"
@@ -72,6 +85,10 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/search_settings.m.js"
            use_base_dir="false"
            type="BINDATA" />
+  <include name="IDR_SETTINGS_SETTINGS_ROUTES_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/settings_routes.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_SHARED_CSS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_shared_css.m.js"
            use_base_dir="false"
@@ -88,4 +105,8 @@
   <include name="IDR_SETTINGS_SETTINGS_V3_JS"
            file="settings.js"
            type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_FAVICON_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_favicon.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
 </grit-part>

chrome/test/data/webui/BUILD.gn

@@ -215,6 +215,7 @@ js2gtest("browser_tests_js_webui") {
     "$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/site_favicon_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/test_extension_control_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",

chrome/test/data/webui/settings/BUILD.gn

@@ -12,6 +12,7 @@ js_modulizer("modulize") {
     "dropdown_menu_tests.js",
     "extension_controlled_indicator_tests.js",
     "pref_util_tests.js",
+    "site_favicon_test.js",
     "settings_slider_tests.js",
     "settings_textarea_tests.js",
     "settings_toggle_button_tests.js",

chrome/test/data/webui/settings/cr_settings_v3_browsertest.js

@@ -97,6 +97,18 @@ TEST_F('CrSettingsPrefUtilV3Test', 'All', function() {
   mocha.run();
 });
 
+// eslint-disable-next-line no-var
+var CrSettingsSiteFaviconV3Test = class extends CrSettingsV3BrowserTest {
+  /** @override */
+  get browsePreload() {
+    return 'chrome://settings/test_loader.html?module=settings/site_favicon_test.m.js';
+  }
+};
+
+TEST_F('CrSettingsSiteFaviconV3Test', 'All', function() {
+  mocha.run();
+});
+
 // eslint-disable-next-line no-var
 var CrSettingsSliderV3Test = class extends CrSettingsV3BrowserTest {
   /** @override */

chrome/test/data/webui/settings/site_favicon_test.js

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// #import 'chrome://settings/settings.js';
+
 suite('SiteFavicon', function() {
   let siteFavicon;
 

tools/polymer/polymer.gni

@@ -3,7 +3,9 @@
 # found in the LICENSE file.
 
 common_namespace_rewrites_polymer = [
+  "cr.icon.getFavicon|getFavicon",
   "cr.ui.FocusOutlineManager|FocusOutlineManager",
+  "cr.ui.FocusRowBehavior|FocusRowBehavior",
   "cr.ui.focusWithoutInk|focusWithoutInk",
   "Polymer.IronA11yAnnouncer|IronA11yAnnouncer",
   "Polymer.PaperRippleBehavior|PaperRippleBehavior",
@@ -18,6 +20,7 @@ common_auto_imports = [
   "ui/webui/resources/cr_elements/cr_radio_button/cr_radio_button_behavior.html|CrRadioButtonBehavior",
   "ui/webui/resources/cr_elements/policy/cr_policy_pref_behavior.html|CrPolicyPrefBehavior",
   "ui/webui/resources/html/cr/ui/focus_outline_manager.html|FocusOutlineManager",
+  "ui/webui/resources/html/cr/ui/focus_row_behavior.html|FocusRowBehavior",
   "ui/webui/resources/html/cr/ui/focus_without_ink.html|focusWithoutInk",
   "ui/webui/resources/html/i18n_behavior.html|I18nBehavior",
   "ui/webui/resources/html/load_time_data.html|loadTimeData",