[Reland] Settings: Port settings_menu/ to Polymer 3.

Originally landed at https://chromium-review.googlesource.com/c/chromium/src/+/2045171
but reverted because of a test failure in linux-chromeos-dbg. Fix for
the test failure is included here.

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

chrome/browser/resources/settings/BUILD.gn

@@ -223,6 +223,7 @@ group("closure_compile_module") {
     "prefs:closure_compile_module",
     "search_engines_page:closure_compile_module",
     "search_page:closure_compile_module",
+    "settings_menu:closure_compile_module",
     "settings_page:closure_compile_module",
   ]
   if (!is_chromeos) {

chrome/browser/resources/settings/page_visibility.html

 <link rel="import" href="chrome://resources/html/cr.html">
+<link rel="import" href="i18n_setup.html">
 
 <script src="page_visibility.js"></script>

chrome/browser/resources/settings/page_visibility.js

@@ -21,7 +21,7 @@
  *   reset: (boolean|undefined),
  * }}
  */
-let PageVisibility;
+/* #export */ let PageVisibility;
 
 /**
  * @typedef {{

chrome/browser/resources/settings/settings.gni

@@ -21,6 +21,7 @@ settings_namespace_rewrites = [
   "settings.routes|routes",
   "settings.SearchEnginesBrowserProxy|SearchEnginesBrowserProxy",
   "settings.StartupUrlsPageBrowserProxy|StartupUrlsPageBrowserProxy",
+  "settings.RouteObserverBehavior|RouteObserverBehavior",
 
   "action_link.m.js|action_link.js",
 

chrome/browser/resources/settings/settings.js

@@ -20,6 +20,7 @@ import './search_engines_page/search_engine_dialog.m.js';
 import './search_engines_page/search_engine_entry.m.js';
 import './search_engines_page/search_engines_page.m.js';
 import './search_page/search_page.m.js';
+import './settings_menu/settings_menu.m.js';
 import './settings_page/settings_subpage.m.js';
 import './settings_page/settings_animated_pages.m.js';
 
@@ -37,6 +38,8 @@ export {FontsBrowserProxy, FontsBrowserProxyImpl} from './appearance_page/fonts_
 export {OnStartupBrowserProxy, OnStartupBrowserProxyImpl} from './on_startup_page/on_startup_browser_proxy.m.js';
 export {EDIT_STARTUP_URL_EVENT} from './on_startup_page/startup_url_entry.m.js';
 export {StartupUrlsPageBrowserProxy, StartupUrlsPageBrowserProxyImpl} from './on_startup_page/startup_urls_page_browser_proxy.m.js';
+export {pageVisibility} from './page_visibility.m.js';
 export {prefToString, stringToPrefValue} from './prefs/pref_util.m.js';
+export {routes} from './route.m.js';
 export {Route, Router} from './router.m.js';
 export {SearchEnginesBrowserProxyImpl} from './search_engines_page/search_engines_browser_proxy.m.js';

chrome/browser/resources/settings/settings_menu/BUILD.gn

@@ -3,6 +3,8 @@
 # found in the LICENSE file.
 
 import("//third_party/closure_compiler/compile_js.gni")
+import("//tools/polymer/polymer.gni")
+import("../settings.gni")
 
 js_type_check("closure_compile") {
   deps = [ ":settings_menu" ]
@@ -16,28 +18,35 @@ js_library("settings_menu") {
   ]
 }
 
-# TODO(crbug.com/1026426): Fix and enable.
-#js_type_check("closure_compile_module") {
-#  is_polymer3 = true
-#  deps = [ ":settings_menu.m" ]
-#}
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [ ":settings_menu.m" ]
+}
 
 js_library("settings_menu.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/settings_menu/settings_menu.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "..:page_visibility.m",
+    "..:router.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:load_time_data.m",
   ]
   extra_deps = [ ":settings_menu_module" ]
 }
 
-import("//tools/polymer/polymer.gni")
-
 group("polymer3_elements") {
-  deps = [ ":settings_menu_module" ]
+  public_deps = [ ":settings_menu_module" ]
 }
 
 polymer_modulizer("settings_menu") {
   js_file = "settings_menu.js"
   html_file = "settings_menu.html"
   html_type = "dom-module"
+  namespace_rewrites = settings_namespace_rewrites
+  auto_imports = [
+    "chrome/browser/resources/settings/page_visibility.html|PageVisibility",
+    "chrome/browser/resources/settings/router.html|RouteObserverBehavior,Router,Route",
+    "ui/webui/resources/html/assert.html|assert",
+  ]
 }

chrome/browser/resources/settings/settings_menu/settings_menu.html

@@ -4,11 +4,13 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_icons_css.html">
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 <link rel="import" href="chrome://resources/html/assert.html">
+<link rel="import" href="chrome://resources/html/load_time_data.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-selector.html">
 <link rel="import" href="../i18n_setup.html">
 <link rel="import" href="../icons.html">
+<link rel="import" href="../page_visibility.html">
 <link rel="import" href="../route.html">
 <link rel="import" href="../router.html">
 <link rel="import" href="../settings_shared_css.html">

chrome/browser/resources/settings/settings_resources_v3.grdp

@@ -97,6 +97,11 @@
            use_base_dir="false"
            type="BINDATA"
            preprocess="true" />
+  <include name="IDR_SETTINGS_MENU_SETTINGS_MENU_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/settings_menu/settings_menu.m.js"
+           use_base_dir="false"
+           type="BINDATA"
+           preprocess="true" />
   <include name="IDR_SETTINGS_ON_STARTUP_PAGE_ON_STARTUP_BROWSER_PROXY_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/on_startup_page/on_startup_browser_proxy.m.js"
            use_base_dir="false"

chrome/test/data/webui/BUILD.gn

@@ -221,6 +221,7 @@ js2gtest("browser_tests_js_webui") {
     "$root_gen_dir/chrome/test/data/webui/settings/pref_util_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/search_engines_page_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/search_page_test.m.js",
+    "$root_gen_dir/chrome/test/data/webui/settings/settings_menu_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/settings_slider_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/settings_subpage_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/settings_textarea_tests.m.js",

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

@@ -22,6 +22,7 @@ js_modulizer("modulize") {
     "search_engines_page_test.js",
     "search_page_test.js",
     "site_favicon_test.js",
+    "settings_menu_test.js",
     "settings_slider_tests.js",
     "settings_subpage_test.js",
     "settings_textarea_tests.js",

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

@@ -252,3 +252,15 @@ var CrSettingsAppearanceFontsPageV3Test =
 TEST_F('CrSettingsAppearanceFontsPageV3Test', 'All', function() {
   mocha.run();
 });
+
+// eslint-disable-next-line no-var
+var CrSettingsMenuV3Test = class extends CrSettingsV3BrowserTest {
+  /** @override */
+  get browsePreload() {
+    return 'chrome://settings/test_loader.html?module=settings/settings_menu_test.m.js';
+  }
+};
+
+TEST_F('CrSettingsMenuV3Test', 'SettingsMenu', function() {
+  mocha.run();
+});