Settings: Migrate site_entry to Polymer 3

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

chrome/browser/resources/settings/lazy_load.js

@@ -65,6 +65,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 './site_settings/chooser_exception_list_entry.m.js';
+import './site_settings/site_entry.m.js';
 import './site_settings/site_list_entry.m.js';
 import './site_settings/site_list.m.js';
 
@@ -86,7 +87,7 @@ export {DownloadsBrowserProxyImpl} from './downloads_page/downloads_browser_prox
 export {SyncBrowserProxyImpl, PageStatus} from './people_page/sync_browser_proxy.m.js';
 export {kMenuCloseDelay} from './languages_page/languages_page.m.js';
 export {LanguagesBrowserProxyImpl} from './languages_page/languages_browser_proxy.m.js';
-export {ChooserType,ContentSetting,ContentSettingsTypes,SiteSettingSource,SITE_EXCEPTION_WILDCARD} from './site_settings/constants.m.js';
+export {ChooserType,ContentSetting,ContentSettingsTypes,SiteSettingSource,SITE_EXCEPTION_WILDCARD,SortMethod} from './site_settings/constants.m.js';
 export {cookieInfo} from './site_settings/cookie_info.m.js';
 export {kControlledByLookup} from './site_settings/site_settings_behavior.m.js';
 export {LocalDataBrowserProxyImpl} from './site_settings/local_data_browser_proxy.m.js';

chrome/browser/resources/settings/settings.gni

@@ -11,6 +11,7 @@ settings_namespace_rewrites = [
   "settings.AboutPageBrowserProxy|AboutPageBrowserProxy",
   "settings.AccountManagerBrowserProxy|AccountManagerBrowserProxy",
   "settings.Account|Account",
+  "settings.AllSitesAction2|AllSitesAction2",
   "settings.AndroidInfoBrowserProxy|AndroidInfoBrowserProxy",
   "settings.AndroidSmsInfo|AndroidSmsInfo",
   "settings.AppearanceBrowserProxy|AppearanceBrowserProxy",
@@ -65,6 +66,7 @@ settings_namespace_rewrites = [
   "settings.SITE_EXCEPTION_WILDCARD|SITE_EXCEPTION_WILDCARD",
   "settings.SiteSettingSource|SiteSettingSource",
   "settings.SiteSettingsPrefsBrowserProxy|SiteSettingsPrefsBrowserProxy",
+  "settings.SortMethod|SortMethod",
   "settings.StartupUrlsPageBrowserProxy|StartupUrlsPageBrowserProxy",
   "settings.StatusAction|StatusAction",
   "settings.StoredAccount|StoredAccount",

chrome/browser/resources/settings/settings_resources_v3.grdp

@@ -602,6 +602,10 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_data_details_subpage.m.js"
            use_base_dir="false"
            type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_ENTRY_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_entry.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_LIST_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_list.m.js"
            use_base_dir="false"

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

@@ -321,7 +321,7 @@ js_type_check("closure_compile_module") {
     #    ":site_data_entry.m",
     #    ":site_details.m",
     #    ":site_details_permission.m",
-    #    ":site_entry.m",
+    ":site_entry.m",
     ":site_list.m",
     ":site_list_entry.m",
     ":site_settings_behavior.m",
@@ -525,7 +525,18 @@ js_library("site_details_permission.m") {
 js_library("site_entry.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/site_entry.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":constants.m",
+    ":local_data_browser_proxy.m",
+    ":site_settings_behavior.m",
+    ":site_settings_prefs_browser_proxy.m",
+    "..:route.m",
+    "..:router.m",
+    "//third_party/polymer/v3_0/components-chromium/iron-collapse:iron-collapse",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render.m",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:load_time_data.m",
+    "//ui/webui/resources/js/cr/ui:focus_row_behavior.m",
   ]
   extra_deps = [ ":site_entry_module" ]
 }
@@ -767,6 +778,15 @@ polymer_modulizer("site_entry") {
   js_file = "site_entry.js"
   html_file = "site_entry.html"
   html_type = "dom-module"
+  auto_imports = settings_auto_imports + [
+                   "chrome/browser/resources/settings/site_settings/constants.html|AllSitesAction2,SortMethod",
+                   "chrome/browser/resources/settings/route.html|routes",
+                   "chrome/browser/resources/settings/router.html|Router",
+                   "chrome/browser/resources/settings/site_settings/local_data_browser_proxy.html|LocalDataBrowserProxy,LocalDataBrowserProxyImpl",
+                   "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|OriginInfo,SiteGroup",
+                   "ui/webui/resources/html/assert.html|assert",
+                 ]
+  namespace_rewrites = settings_namespace_rewrites
 }
 
 polymer_modulizer("site_list") {

chrome/browser/resources/settings/site_settings/constants.js

@@ -137,7 +137,7 @@ cr.define('settings', function() {
    * chrome/browser/ui/webui/settings/site_settings_handler.cc
    * @enum {number}
    */
-  const AllSitesAction2 = {
+  /* #export */ const AllSitesAction2 = {
     LOAD_PAGE: 0,
     RESET_SITE_GROUP_PERMISSIONS: 1,
     RESET_ORIGIN_PERMISSIONS: 2,
@@ -151,7 +151,7 @@ cr.define('settings', function() {
    * Contains the possible sort methods.
    * @enum {string}
    */
-  const SortMethod = {
+  /* #export */ const SortMethod = {
     NAME: 'name',
     MOST_VISITED: 'most-visited',
     STORAGE: 'data-stored',

chrome/browser/resources/settings/site_settings/site_entry.html

@@ -3,14 +3,18 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action_menu.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.html">
+<link rel="import" href="chrome://resources/html/assert.html">
 <link rel="import" href="chrome://resources/html/cr/ui/focus_row_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
+<link rel="import" href="../i18n_setup.html">
 <link rel="import" href="../route.html">
 <link rel="import" href="../router.html">
 <link rel="import" href="../settings_shared_css.html">
 <link rel="import" href="../site_favicon.html">
+<link rel="import" href="constants.html">
 <link rel="import" href="local_data_browser_proxy.html">
 <link rel="import" href="site_settings_behavior.html">
+<link rel="import" href="site_settings_prefs_browser_proxy.html">
 
 <dom-module id="site-entry">
   <template>

chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js

@@ -49,7 +49,7 @@ let IsValid;
               hasPermissionSettings: boolean,
               isInstalled: boolean}}
  */
-let OriginInfo;
+/* #export */ let OriginInfo;
 
 /**
  * Represents a list of sites, grouped under the same eTLD+1. For example, an
@@ -61,7 +61,7 @@ let OriginInfo;
  *            origins: Array<OriginInfo>,
  *            hasInstalledPWA: boolean}}
  */
-let SiteGroup;
+/* #export */ let SiteGroup;
 
 /**
  * The site exception information passed from the C++ handler.

chrome/test/data/webui/BUILD.gn

@@ -259,6 +259,7 @@ js2gtest("browser_tests_js_webui") {
     "$root_gen_dir/chrome/test/data/webui/settings/test_local_data_browser_proxy.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/test_metrics_browser_proxy.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/site_data_details_subpage_tests.m.js",
+    "$root_gen_dir/chrome/test/data/webui/settings/site_entry_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/site_list_entry_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/site_list_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/sync_test_util.m.js",

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

@@ -54,6 +54,7 @@ js_modulizer("modulize") {
     "settings_toggle_button_tests.js",
     "settings_ui_tests.js",
     "site_data_details_subpage_tests.js",
+    "site_entry_tests.js",
     "site_list_entry_tests.js",
     "site_list_tests.js",
     "site_favicon_test.js",
@@ -126,6 +127,7 @@ js_modulizer("modulize") {
                          "test_util.createDefaultContentSetting|createDefaultContentSetting",
                          "test_util.createRawChooserException|createRawChooserException",
                          "test_util.createRawSiteException|createRawSiteException",
+                         "test_util.createSiteGroup|createSiteGroup",
                          "test_util.createSiteSettingsPrefs|createSiteSettingsPrefs",
                          "test_util.getContentSettingsTypeFromChooserType|getContentSettingsTypeFromChooserType",
                          "test_util.setupPopstateListener|setupPopstateListener",

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

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

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

@@ -2,6 +2,18 @@
 // 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://test/cr_elements/cr_policy_strings.js';
+// #import {ContentSettingsTypes,LocalDataBrowserProxyImpl,SiteSettingsPrefsBrowserProxyImpl,SortMethod} from 'chrome://settings/lazy_load.js';
+// #import {eventToPromise} from 'chrome://test/test_util.m.js';
+// #import {createSiteGroup} from 'chrome://test/settings/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 {Router, routes} from 'chrome://settings/settings.js';
+// #import {TestLocalDataBrowserProxy} from 'chrome://test/settings/test_local_data_browser_proxy.m.js';
+// #import {TestSiteSettingsPrefsBrowserProxy} from 'chrome://test/settings/test_site_settings_prefs_browser_proxy.m.js';
+// clang-format on
+
 suite('SiteEntry', function() {
   /**
    * An example eTLD+1 Object with multiple origins grouped under it.

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

@@ -165,7 +165,7 @@ cr.define('test_util', function() {
    *     in the site group.
    * @return {SiteGroup}
    */
-  function createSiteGroup(eTLDPlus1Name, originList, mockUsage) {
+  /* #export */ function createSiteGroup(eTLDPlus1Name, originList, mockUsage) {
     if (mockUsage == undefined) {
       mockUsage = 0;
     }