Settings: Port search_page/ to Polymer 3.

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

chrome/browser/resources/settings/BUILD.gn

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

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

@@ -219,8 +219,7 @@ polymer_modulizer("search_engines_page") {
   js_file = "search_engines_page.js"
   html_file = "search_engines_page.html"
   html_type = "dom-module"
-  namespace_rewrites =
-      settings_namespace_rewrites + [ "settings.routes|routes" ]
+  namespace_rewrites = settings_namespace_rewrites
   auto_imports = settings_auto_imports + [
                    "chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.html|SearchEnginesBrowserProxyImpl,SearchEngine,SearchEnginesInfo",
                    "chrome/browser/resources/settings/route.html|routes",

chrome/browser/resources/settings/search_page/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 = [ ":search_page" ]
@@ -19,28 +21,37 @@ js_library("search_page") {
   ]
 }
 
-# TODO(crbug.com/1026426): Fix and enable.
-#js_type_check("closure_compile_module") {
-#  is_polymer3 = true
-#  deps = [ ":search_page.m" ]
-#}
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [ ":search_page.m" ]
+}
 
 js_library("search_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/search_page/search_page.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    "..:route.m",
+    "..:router.m",
+    "../search_engines_page:search_engines_browser_proxy.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:cr.m",
   ]
   extra_deps = [ ":search_page_module" ]
+  externs_list = [ "$externs_path/settings_private.js" ]
 }
 
-import("//tools/polymer/polymer.gni")
-
 group("polymer3_elements") {
-  deps = [ ":search_page_module" ]
+  public_deps = [ ":search_page_module" ]
 }
 
 polymer_modulizer("search_page") {
   js_file = "search_page.js"
   html_file = "search_page.html"
   html_type = "dom-module"
+  namespace_rewrites = settings_namespace_rewrites
+  auto_imports = [
+    "chrome/browser/resources/settings/route.html|routes",
+    "chrome/browser/resources/settings/router.html|Router,Route",
+    "chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.html|SearchEnginesBrowserProxyImpl,SearchEnginesBrowserProxy,SearchEngine",
+    "ui/webui/resources/html/cr.html|addWebUIListener",
+  ]
 }

chrome/browser/resources/settings/search_page/search_page.html

@@ -3,6 +3,7 @@
 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html">
 <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
 <link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
+<link rel="import" href="chrome://resources/html/cr.html">
 <link rel="import" href="../controls/extension_controlled_indicator.html">
 <link rel="import" href="../i18n_setup.html">
 <link rel="import" href="../route.html">

chrome/browser/resources/settings/search_page/search_page.js

@@ -68,7 +68,8 @@ Polymer({
 
   /** @private */
   onManageSearchEnginesTap_() {
-    settings.Router.getInstance().navigateTo(settings.routes.SEARCH_ENGINES);
+    settings.Router.getInstance().navigateTo(
+        /** @type {!settings.Route} */ (settings.routes.SEARCH_ENGINES));
   },
 
   /**

chrome/browser/resources/settings/settings.gni

@@ -13,6 +13,7 @@ settings_namespace_rewrites = [
   "Settings.PrefUtil.prefToString|prefToString",
   "Settings.PrefUtil.stringToPrefValue|stringToPrefValue",
   "settings.Route|Route",
+  "settings.routes|routes",
   "settings.SearchEnginesBrowserProxy|SearchEnginesBrowserProxy",
   "settings.DefaultBrowserBrowserProxy|DefaultBrowserBrowserProxy",
 

chrome/browser/resources/settings/settings.js

@@ -15,6 +15,7 @@ import './search_engines_page/omnibox_extension_entry.m.js';
 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_page/settings_subpage.m.js';
 import './settings_page/settings_animated_pages.m.js';
 

chrome/browser/resources/settings/settings_resources_v3.grdp

@@ -126,6 +126,10 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engines_page.m.js"
            use_base_dir="false"
            type="BINDATA" />
+  <include name="IDR_SETTINGS_SEARCH_PAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/search_page/search_page.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SEARCH_SETTINGS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/search_settings.m.js"
            use_base_dir="false"

chrome/test/data/webui/BUILD.gn

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

@@ -15,6 +15,7 @@ js_modulizer("modulize") {
     "pref_util_tests.js",
     "settings_animated_pages_test.js",
     "search_engines_page_test.js",
+    "search_page_test.js",
     "site_favicon_test.js",
     "settings_slider_tests.js",
     "settings_subpage_test.js",
@@ -38,6 +39,7 @@ js_modulizer("modulize") {
     "global.traceAssertionsForTesting|window.traceAssertionsForTesting",
     "Settings.PrefUtil.stringToPrefValue|stringToPrefValue",
     "settings_search.TestSearchEnginesBrowserProxy|TestSearchEnginesBrowserProxy",
+    "settings_search.createSampleSearchEngine|createSampleSearchEngine",
     "settings.SearchEnginesBrowserProxyImpl|SearchEnginesBrowserProxyImpl",
   ]
 }

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

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

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

@@ -2,6 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// clang-format off
+// #import 'chrome://settings/settings.js';
+// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// #import {SearchEnginesBrowserProxyImpl} from 'chrome://settings/settings.js';
+// #import {TestSearchEnginesBrowserProxy, createSampleSearchEngine} from 'chrome://test/settings/test_search_engines_browser_proxy.m.js';
+// clang-format on
+
 cr.define('settings_search_page', function() {
   function generateSearchEngineInfo() {
     const searchEngines0 =
@@ -125,4 +132,5 @@ cr.define('settings_search_page', function() {
     });
 
   });
+  // #cr_define_end
 });

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

@@ -80,7 +80,8 @@ cr.define('settings_search', function() {
    * @param {boolean} canBeRemoved
    * @return {!SearchEngine}
    */
-  function createSampleSearchEngine(canBeDefault, canBeEdited, canBeRemoved) {
+  /* #export */ function createSampleSearchEngine(
+      canBeDefault, canBeEdited, canBeRemoved) {
     return {
       canBeDefault: canBeDefault,
       canBeEdited: canBeEdited,