Settings: migrate category_default_setting to Polymer 3

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

chrome/browser/resources/settings/lazy_load.js

@@ -18,7 +18,7 @@ import './search_engines_page/search_engines_page.m.js';
 // import './site_settings/all_sites.m.js';
 import './site_settings/site_data_details_subpage.m.js';
 // import './site_settings_page/site_settings_page.m.js';
-// import './site_settings/category_default_setting.m.js';
+import './site_settings/category_default_setting.m.js';
 // import './site_settings/category_setting_exceptions.m.js';
 import './site_settings/chooser_exception_list.m.js';
 // import './site_settings/media_picker.m.js';
@@ -90,7 +90,7 @@ export {ChooserType,ContentSetting,ContentSettingsTypes,SiteSettingSource,SITE_E
 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';
-export {SiteSettingsPrefsBrowserProxyImpl} from './site_settings/site_settings_prefs_browser_proxy.m.js';
+export {ContentSettingProvider,SiteSettingsPrefsBrowserProxyImpl} from './site_settings/site_settings_prefs_browser_proxy.m.js';
 
 // <if expr="not chromeos">
 export {SystemPageBrowserProxyImpl} from './system_page/system_page_browser_proxy.m.js';

chrome/browser/resources/settings/settings_resources_v3.grdp

@@ -566,6 +566,10 @@
              use_base_dir="false"
              type="BINDATA" />
   </if>
+  <include name="IDR_SETTINGS_SITE_SETTINGS_CATEGORY_DEFAULT_SETTING_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/category_default_setting.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_SITE_SETTINGS_CHOOSER_EXCEPTION_LIST_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/chooser_exception_list.m.js"
            use_base_dir="false"

chrome/browser/resources/settings/settings_routes.js

@@ -21,6 +21,7 @@
  *   CHROME_CLEANUP: !settings.Route,
  *   CLEAR_BROWSER_DATA: !settings.Route,
  *   CLOUD_PRINTERS: !settings.Route,
+ *   COOKIES: !settings.Route,
  *   DEFAULT_BROWSER: !settings.Route,
  *   DOWNLOADS: !settings.Route,
  *   EDIT_DICTIONARY: !settings.Route,

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

@@ -303,8 +303,8 @@ js_type_check("closure_compile_module") {
     #    ":all_sites.m",
     #    ":all_sites_icons.m",
     ":android_info_browser_proxy.m",
+    ":category_default_setting.m",
 
-    #    ":category_default_setting.m",
     #    ":category_setting_exceptions.m",
     ":chooser_exception_list.m",
     ":chooser_exception_list_entry.m",
@@ -371,8 +371,14 @@ js_library("android_info_browser_proxy.m") {
 js_library("category_default_setting.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/category_default_setting.m.js" ]
   deps = [
-    # TODO: Fill those in.
+    ":constants.m",
+    ":site_settings_behavior.m",
+    "..:route.m",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:load_time_data.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
+  externs_list = [ "$externs_path/settings_private.js" ]
   extra_deps = [ ":category_default_setting_module" ]
 }
 
@@ -646,6 +652,13 @@ polymer_modulizer("category_default_setting") {
   js_file = "category_default_setting.js"
   html_file = "category_default_setting.html"
   html_type = "dom-module"
+  auto_imports = settings_auto_imports + [
+                   "chrome/browser/resources/settings/route.html|routes",
+                   "chrome/browser/resources/settings/site_settings/constants.html|ContentSetting,ContentSettingsTypes",
+                   "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|ContentSettingProvider,DefaultContentSetting",
+                   "ui/webui/resources/html/assert.html|assert,assertNotReached",
+                 ]
+  namespace_rewrites = settings_namespace_rewrites
 }
 
 polymer_modulizer("category_setting_exceptions") {

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

@@ -3,6 +3,7 @@
 <link rel="import" href="chrome://resources/html/assert.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="../controls/settings_toggle_button.html">
+<link rel="import" href="../i18n_setup.html">
 <link rel="import" href="../settings_shared_css.html">
 <link rel="import" href="constants.html">
 <link rel="import" href="../route.html">

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

@@ -18,7 +18,7 @@
  * should be treated as 'default'.
  * @enum {string}
  */
-const ContentSettingProvider = {
+/* #export */ const ContentSettingProvider = {
   POLICY: 'policy',
   SUPERVISED_USER: 'supervised_user',
   EXTENSION: 'extension',
@@ -125,7 +125,7 @@ let RecentSitePermissions;
  * @typedef {{setting: !settings.ContentSetting,
  *            source: !ContentSettingProvider}}
  */
-let DefaultContentSetting;
+/* #export */ let DefaultContentSetting;
 
 /**
  * @typedef {{name: string,

chrome/test/data/webui/BUILD.gn

@@ -217,6 +217,7 @@ js2gtest("browser_tests_js_webui") {
     "$root_gen_dir/chrome/test/data/webui/settings/autofill_section_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/basic_page_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/checkbox_tests.m.js",
+    "$root_gen_dir/chrome/test/data/webui/settings/category_default_setting_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/chooser_exception_list_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/chooser_exception_list_entry_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/clear_browsing_data_test.m.js",

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

@@ -14,6 +14,7 @@ js_modulizer("modulize") {
     "autofill_page_test.js",
     "autofill_section_test.js",
     "basic_page_test.js",
+    "category_default_setting_tests.js",
     "checkbox_tests.js",
     "chooser_exception_list_entry_tests.js",
     "chooser_exception_list_tests.js",
@@ -121,6 +122,7 @@ js_modulizer("modulize") {
                          "sync_test_util.getSyncAllPrefs|getSyncAllPrefs",
                          "sync_test_util.simulateSyncStatus|simulateSyncStatus",
                          "test_util.createContentSettingTypeToValuePair|createContentSettingTypeToValuePair",
+                         "test_util.createDefaultContentSetting|createDefaultContentSetting",
                          "test_util.createRawChooserException|createRawChooserException",
                          "test_util.createRawSiteException|createRawSiteException",
                          "test_util.createSiteSettingsPrefs|createSiteSettingsPrefs",

chrome/test/data/webui/settings/category_default_setting_tests.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 {ContentSetting,ContentSettingProvider,ContentSettingsTypes,SiteSettingsPrefsBrowserProxyImpl} from 'chrome://settings/lazy_load.js';
+// #import {createContentSettingTypeToValuePair,createDefaultContentSetting,createSiteSettingsPrefs} from 'chrome://test/settings/test_util.m.js';
+// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// #import {TestSiteSettingsPrefsBrowserProxy} from 'chrome://test/settings/test_site_settings_prefs_browser_proxy.m.js';
+// clang-format on
+
 /** @fileoverview Suite of tests for category-default-setting. */
 suite('CategoryDefaultSetting', function() {
   /**

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

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

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

@@ -30,7 +30,7 @@ cr.define('test_util', function() {
    * overwrite the defaults in this function's return value.
    * @return {DefaultContentSetting}
    */
-  function createDefaultContentSetting(override) {
+  /* #export */ function createDefaultContentSetting(override) {
     if (override === undefined) {
       override = {};
     }