Settings: Migrate settings_main/* to Polymer 3

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

chrome/browser/resources/settings/BUILD.gn

@@ -235,6 +235,7 @@ group("closure_compile_module") {
     "reset_page:closure_compile_module",
     "search_engines_page:closure_compile_module",
     "search_page:closure_compile_module",
+    "settings_main:closure_compile_module",
     "settings_menu:closure_compile_module",
     "settings_page:closure_compile_module",
   ]

chrome/browser/resources/settings/search_settings.js

@@ -430,7 +430,7 @@ cr.define('settings', function() {
     }
   }
 
-  class SearchRequest {
+  /* #export */ class SearchRequest {
     /**
      * @param {string} rawQuery
      * @param {!Element} root
@@ -630,7 +630,7 @@ cr.define('settings', function() {
    * Sets the SearchManager singleton instance, useful for testing.
    * @param {!SearchManager} searchManager
    */
-  function setSearchManagerForTesting(searchManager) {
+  /* #export */ function setSearchManagerForTesting(searchManager) {
     instance = searchManager;
   }
 

chrome/browser/resources/settings/settings.js

@@ -29,6 +29,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_main/settings_main.m.js';
 import './settings_menu/settings_menu.m.js';
 import './settings_page/settings_subpage.m.js';
 import './settings_page/settings_animated_pages.m.js';
@@ -65,7 +66,7 @@ export {CrSettingsPrefs} from './prefs/prefs_types.m.js';
 export {DownloadsBrowserProxyImpl} from './downloads_page/downloads_browser_proxy.m.js';
 export {ExtensionControlBrowserProxyImpl} from './extension_control_browser_proxy.m.js';
 export {FontsBrowserProxy, FontsBrowserProxyImpl} from './appearance_page/fonts_browser_proxy.m.js';
-export {getSearchManager} from './search_settings.m.js';
+export {getSearchManager, SearchRequest, setSearchManagerForTesting} from './search_settings.m.js';
 export {kMenuCloseDelay} from './languages_page/languages_page.m.js';
 export {LanguagesBrowserProxyImpl} from './languages_page/languages_browser_proxy.m.js';
 export {LifetimeBrowserProxyImpl} from './lifetime_browser_proxy.m.js';

chrome/browser/resources/settings/settings_main/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_main" ]
@@ -23,28 +25,43 @@ js_library("settings_main") {
   ]
 }
 
-# TODO(crbug.com/1026426): Fix and enable.
-#js_type_check("closure_compile_module") {
-#  is_polymer3 = true
-#  deps = [ ":settings_main.m" ]
-#}
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [ ":settings_main.m" ]
+}
 
 js_library("settings_main.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/settings_main/settings_main.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "..:page_visibility.m",
+    "..:route.m",
+    "..:router.m",
+    "..:search_settings.m",
+    "../about_page:about_page.m",
+    "../about_page:about_page_browser_proxy.m",
+    "../basic_page:basic_page.m",
+    "../settings_page:main_page_behavior.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer:iron-a11y-announcer",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:load_time_data.m",
   ]
   extra_deps = [ ":settings_main_module" ]
 }
 
-import("//tools/polymer/polymer.gni")
-
 group("polymer3_elements") {
-  deps = [ ":settings_main_module" ]
+  public_deps = [ ":settings_main_module" ]
 }
 
 polymer_modulizer("settings_main") {
   js_file = "settings_main.js"
   html_file = "settings_main.html"
   html_type = "dom-module"
+  auto_imports = settings_auto_imports + [
+                   "chrome/browser/resources/settings/about_page/about_page_browser_proxy.html|AboutPageBrowserProxyImpl",
+                   "chrome/browser/resources/settings/page_visibility.html|PageVisibility",
+                   "chrome/browser/resources/settings/route.html|routes",
+                   "chrome/browser/resources/settings/router.html|Route,Router,RouteObserverBehavior",
+                   "ui/webui/resources/html/assert.html|assert,assertNotReached",
+                 ]
+  namespace_rewrites = settings_namespace_rewrites
 }

chrome/browser/resources/settings/settings_main/settings_main.html

@@ -3,6 +3,7 @@
 <link rel="import" href="chrome://resources/cr_components/managed_footnote/managed_footnote.html">
 <link rel="import" href="chrome://resources/cr_elements/hidden_style_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/search_highlight_utils.html">
 <link rel="import" href="chrome://resources/html/promise_resolver.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-announcer/iron-a11y-announcer.html">
@@ -11,6 +12,7 @@
 <link rel="import" href="../basic_page/basic_page.html">
 <link rel="import" href="../i18n_setup.html">
 <link rel="import" href="../prefs/prefs.html">
+<link rel="import" href="../page_visibility.html">
 <link rel="import" href="../route.html">
 <link rel="import" href="../router.html">
 <link rel="import" href="../search_settings.html">

chrome/browser/resources/settings/settings_resources_v3.grdp

@@ -342,6 +342,10 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/search_settings.m.js"
            use_base_dir="false"
            type="BINDATA" />
+  <include name="IDR_SETTINGS_SETTINGS_MAIN_SETTINGS_MAIN_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/settings_main/settings_main.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SETTINGS_PAGE_MAIN_PAGE_BEHAVIOR_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/settings_page/main_page_behavior.m.js"
            use_base_dir="false"

chrome/test/data/webui/BUILD.gn

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

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

@@ -36,6 +36,7 @@ js_modulizer("modulize") {
     "search_page_test.js",
     "search_settings_test.js",
     "settings_animated_pages_test.js",
+    "settings_main_test.js",
     "settings_menu_test.js",
     "settings_slider_tests.js",
     "settings_subpage_test.js",
@@ -69,6 +70,7 @@ js_modulizer("modulize") {
                          "settings.getFakeLanguagePrefs|getFakeLanguagePrefs",
                          "settings.kMenuCloseDelay|kMenuCloseDelay",
                          "settings.setLanguageSettingsPrivateApiForTest|setLanguageSettingsPrivateApiForTest",
+                         "settings.setSearchManagerForTesting|setSearchManagerForTesting",
                          "settings.TestLanguagesBrowserProxy|TestLanguagesBrowserProxy",
                          "settings.TestLifetimeBrowserProxy|TestLifetimeBrowserProxy",
                          "settings_search.createSampleSearchEngine|createSampleSearchEngine",

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

@@ -472,3 +472,24 @@ var CrSettingsBasicPageV3Test = class extends CrSettingsV3BrowserTest {
 TEST_F('CrSettingsBasicPageV3Test', 'All', function() {
   mocha.run();
 });
+
+// eslint-disable-next-line no-var
+var CrSettingsMainPageV3Test = class extends CrSettingsV3BrowserTest {
+  /** @override */
+  get browsePreload() {
+    return 'chrome://settings/test_loader.html?module=settings/settings_main_test.m.js';
+  }
+};
+
+// Copied from Polymer 2 version of tests:
+// Times out on Windows Tests (dbg). See https://crbug.com/651296.
+// Times out / crashes on chromium.linux/Linux Tests (dbg) crbug.com/667882
+// Times out on Linux CFI. See http://crbug.com/929288.
+GEN('#if !defined(NDEBUG) || (defined(OS_LINUX) && defined(IS_CFI))');
+GEN('#define MAYBE_MainPageV3 DISABLED_MainPageV3');
+GEN('#else');
+GEN('#define MAYBE_MainPageV3 MainPageV3');
+GEN('#endif');
+TEST_F('CrSettingsMainPageV3Test', 'MAYBE_MainPageV3', function() {
+  mocha.run();
+});

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

@@ -2,6 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// clang-format off
+// #import {CrSettingsPrefs, pageVisibility, Router, routes, SearchRequest, setSearchManagerForTesting} from 'chrome://settings/settings.js'
+// #import {eventToPromise, whenAttributeIs} from 'chrome://test/test_util.m.js';
+// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// #import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
+// #import {TestBrowserProxy} from 'chrome://test/test_browser_proxy.m.js';
+// clang-format on
+
 cr.define('settings_main_page', function() {
   /**
    * Extending TestBrowserProxy even though SearchManager is not a browser proxy
@@ -362,4 +370,5 @@ cr.define('settings_main_page', function() {
               loadTimeData.getString('aboutPageTitle')));
     });
   });
+  // #cr_define_end
 });