Settings: Migrate site_data and site_data_entry to Polymer 3

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

chrome/browser/resources/settings/global_scroll_target_behavior.js

@@ -21,7 +21,7 @@ cr.define('settings', function() {
   let scrollTargetResolver = new PromiseResolver();
 
   /** @polymerBehavior */
-  const GlobalScrollTargetBehaviorImpl = {
+  /* #export */ const GlobalScrollTargetBehaviorImpl = {
     properties: {
       /**
        * Read only property for the scroll target.

chrome/browser/resources/settings/lazy_load.js

@@ -24,7 +24,7 @@ import './site_settings/chooser_exception_list.m.js';
 // import './site_settings/media_picker.m.js';
 // import './site_settings/pdf_documents.m.js';
 // import './site_settings/protocol_handlers.m.js';
-// import './site_settings/site_data.m.js';
+import './site_settings/site_data.m.js';
 import './site_settings/site_details.m.js';
 // import './site_settings/zoom_levels.m.js';
 

chrome/browser/resources/settings/settings_resources_v3.grdp

@@ -625,10 +625,18 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/local_data_browser_proxy.m.js"
            use_base_dir="false"
            type="BINDATA" />
+  <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DATA_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_data.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DATA_DETAILS_SUBPAGE_M_JS"
            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_DATA_ENTRY_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_data_entry.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DETAILS_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_details.m.js"
            use_base_dir="false"

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

@@ -314,10 +314,9 @@ js_type_check("closure_compile_module") {
     #    ":media_picker.m",
     #    ":pdf_documents.m",
     #    ":protocol_handlers.m",
-    #    ":site_data.m",
+    ":site_data.m",
     ":site_data_details_subpage.m",
-
-    #    ":site_data_entry.m",
+    ":site_data_entry.m",
     ":site_details.m",
     ":site_details_permission.m",
     ":site_entry.m",
@@ -470,7 +469,19 @@ js_library("protocol_handlers.m") {
 js_library("site_data.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/site_data.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":cookie_info.m",
+    ":local_data_browser_proxy.m",
+    ":site_data_entry.m",
+    ":site_settings_behavior.m",
+    "..:global_scroll_target_behavior.m",
+    "..:route.m",
+    "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field.m",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js:list_property_update_behavior.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
+    "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
   extra_deps = [ ":site_data_module" ]
 }
@@ -492,7 +503,11 @@ js_library("site_data_details_subpage.m") {
 js_library("site_data_entry.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/site_data_entry.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":cookie_info.m",
+    ":local_data_browser_proxy.m",
+    "//ui/webui/resources/js:i18n_behavior.m",
+    "//ui/webui/resources/js:icon.m",
+    "//ui/webui/resources/js/cr/ui:focus_row_behavior.m",
   ]
   extra_deps = [ ":site_data_entry_module" ]
 }
@@ -744,6 +759,14 @@ polymer_modulizer("site_data") {
   js_file = "site_data.js"
   html_file = "site_data.html"
   html_type = "dom-module"
+  auto_imports = settings_auto_imports + [
+                   "chrome/browser/resources/settings/global_scroll_target_behavior.html|GlobalScrollTargetBehavior,GlobalScrollTargetBehaviorImpl",
+                   "chrome/browser/resources/settings/route.html|routes",
+                   "chrome/browser/resources/settings/router.html|Route,Router,RouteObserverBehavior",
+                   "chrome/browser/resources/settings/site_settings/local_data_browser_proxy.html|LocalDataBrowserProxy,LocalDataBrowserProxyImpl",
+                   "chrome/browser/resources/settings/site_settings/site_data_entry.html|CookieDataSummaryItem",
+                 ]
+  namespace_rewrites = settings_namespace_rewrites
 }
 
 polymer_modulizer("site_data_details_subpage") {
@@ -763,6 +786,8 @@ polymer_modulizer("site_data_entry") {
   js_file = "site_data_entry.js"
   html_file = "site_data_entry.html"
   html_type = "dom-module"
+  auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/site_settings/local_data_browser_proxy.html|LocalDataBrowserProxy,LocalDataBrowserProxyImpl" ]
+  namespace_rewrites = settings_namespace_rewrites
 }
 
 polymer_modulizer("site_details") {

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

@@ -13,6 +13,7 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner-lite.html">
 <link rel="import" href="../global_scroll_target_behavior.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">

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

@@ -7,15 +7,6 @@
  * 'site-data' handles showing the local storage summary list for all sites.
  */
 
-/**
- * @typedef {{
- *   site: string,
- *   id: string,
- *   localData: string,
- * }}
- */
-let CookieDataSummaryItem;
-
 /**
  * @typedef {{
  *   id: string,

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

@@ -8,6 +8,7 @@
 <link rel="import" href="../settings_shared_css.html">
 <link rel="import" href="../site_favicon.html">
 <link rel="import" href="cookie_info.html">
+<link rel="import" href="local_data_browser_proxy.html">
 
 <dom-module id="site-data-entry">
   <template>

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

@@ -7,6 +7,15 @@
  * 'site-data-entry' handles showing the local storage summary for a site.
  */
 
+/**
+ * @typedef {{
+ *   site: string,
+ *   id: string,
+ *   localData: string,
+ * }}
+ */
+/* #export */ let CookieDataSummaryItem;
+
 Polymer({
   is: 'site-data-entry',
 

chrome/test/data/webui/BUILD.gn

@@ -265,6 +265,7 @@ js2gtest("browser_tests_js_webui") {
     "$root_gen_dir/chrome/test/data/webui/settings/test_about_page_browser_proxy.m.js",
     "$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_test.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_details_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/site_details_permission_tests.m.js",

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

@@ -58,6 +58,7 @@ js_modulizer("modulize") {
     "settings_textarea_tests.js",
     "settings_toggle_button_tests.js",
     "settings_ui_tests.js",
+    "site_data_test.js",
     "site_data_details_subpage_tests.js",
     "site_details_tests.js",
     "site_details_permission_tests.js",

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

@@ -1761,6 +1761,7 @@ CrSettingsSiteDataTest.prototype = {
   ]),
 };
 
+// Disabled for flakiness, see https://crbug.com/1061249
 TEST_F('CrSettingsSiteDataTest', 'DISABLED_All', function() {
   mocha.run();
 });

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

@@ -304,6 +304,8 @@ TEST_F('CrSettingsPersonalizationOptionsV3Test', 'AllBuildsOld', function() {
  ['SearchEngines', 'search_engines_page_test.m.js'],
  ['SearchPage', 'search_page_test.m.js'],
  ['Search', 'search_settings_test.m.js'],
+ // Copied from P2 test: Disabled for flakiness, see https://crbug.com/1061249
+ ['SiteData', 'site_data_test.m.js', 'DISABLED_All'],
  ['SiteDataDetails', 'site_data_details_subpage_tests.m.js'],
  ['SiteDetailsPermission', 'site_details_permission_tests.m.js'],
  ['SiteEntry', 'site_entry_tests.m.js'],

chrome/test/data/webui/settings/site_data_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 {eventToPromise} from 'chrome://test/test_util.m.js';
+// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// #import {LocalDataBrowserProxyImpl} from 'chrome://settings/lazy_load.js';
+// #import {Router,routes} from 'chrome://settings/settings.js';
+// #import {TestLocalDataBrowserProxy} from 'chrome://test/settings/test_local_data_browser_proxy.m.js';
+// clang-format on
+
 suite('SiteDataTest', function() {
   /** @type {SiteDataElement} */
   let siteData;