Settings: Port privacy_page/cookies_page.html to Polymer3.

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

chrome/browser/resources/settings/lazy_load.js

@@ -9,10 +9,7 @@ import './autofill_page/passwords_section.m.js';
 import './autofill_page/payments_section.m.js';
 import './clear_browsing_data_dialog/clear_browsing_data_dialog.m.js';
 import './search_engines_page/search_engines_page.m.js';
-
-// TODO(https://crbug.com/1026426): Uncomment these imports once the pages have
-// been migrated to Polymer 3.
-// import './privacy_page/cookies_page.m.js';
+import './privacy_page/cookies_page.m.js';
 import './privacy_page/security_keys_subpage.m.js';
 import './privacy_page/security_page.m.js';
 import './site_settings/all_sites.m.js';
@@ -89,7 +86,7 @@ export {ClearBrowsingDataBrowserProxyImpl} from './clear_browsing_data_dialog/cl
 export {DownloadsBrowserProxyImpl} from './downloads_page/downloads_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,SortMethod} from './site_settings/constants.m.js';
+export {ChooserType,ContentSetting,ContentSettingsTypes,CookieControlsMode,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/privacy_page/BUILD.gn

@@ -206,6 +206,7 @@ js_type_check("closure_compile_module") {
   is_polymer3 = true
   deps = [
     ":collapse_radio_button.m",
+    ":cookies_page.m",
     ":do_not_track_toggle.m",
     ":passwords_leak_detection_toggle.m",
     ":personalization_options.m",
@@ -224,6 +225,21 @@ js_type_check("closure_compile_module") {
   ]
 }
 
+js_library("cookies_page.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/cookies_page.m.js" ]
+  deps = [
+    "..:metrics_browser_proxy.m",
+    "..:route.m",
+    "..:router.m",
+    "../prefs:prefs_behavior.m",
+    "../site_settings:site_settings_prefs_browser_proxy.m",
+    "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:web_ui_listener_behavior.m",
+  ]
+  extra_deps = [ ":cookies_page_module" ]
+}
+
 js_library("collapse_radio_button.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/privacy_page/collapse_radio_button.m.js" ]
   deps = [
@@ -422,6 +438,7 @@ js_library("security_page.m") {
 group("polymer3_elements") {
   public_deps = [
     ":collapse_radio_button_module",
+    ":cookies_page_module",
     ":do_not_track_toggle_module",
     ":modulize",
     ":passwords_leak_detection_toggle_module",
@@ -439,6 +456,21 @@ group("polymer3_elements") {
   ]
 }
 
+polymer_modulizer("cookies_page") {
+  js_file = "cookies_page.js"
+  html_file = "cookies_page.html"
+  html_type = "dom-module"
+  namespace_rewrites = settings_namespace_rewrites
+  auto_imports = settings_auto_imports + [
+                   "chrome/browser/resources/settings/route.html|routes",
+                   "chrome/browser/resources/settings/router.html|Router",
+                   "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|SiteSettingsPrefsBrowserProxy,SiteSettingsPrefsBrowserProxyImpl,ContentSettingProvider,CookieControlsManagedState,DefaultContentSetting",
+                   "chrome/browser/resources/settings/site_settings/constants.html|ContentSettingsTypes,SiteSettingSource,CookieControlsMode,ContentSetting",
+                   "ui/webui/resources/html/assert.html|assert",
+                   "chrome/browser/resources/settings/metrics_browser_proxy.html|PrivacyElementInteractions,MetricsBrowserProxy,MetricsBrowserProxyImpl",
+                 ]
+}
+
 polymer_modulizer("collapse_radio_button") {
   js_file = "collapse_radio_button.js"
   html_file = "collapse_radio_button.html"

chrome/browser/resources/settings/settings.gni

@@ -28,6 +28,7 @@ settings_namespace_rewrites = [
   "settings.ChromeCleanupRemovalListItem|ChromeCleanupRemovalListItem",
   "settings.ClearBrowsingDataBrowserProxy|ClearBrowsingDataBrowserProxy",
   "settings.ContentSetting|ContentSetting",
+  "settings.CookieControlsMode|CookieControlsMode",
   "settings.CreditCardEntry|CreditCardEntry",
   "settings.BrowserProfile|BrowserProfile",
   "settings.DefaultBrowserBrowserProxy|DefaultBrowserBrowserProxy",

chrome/browser/resources/settings/settings_resources.grd

@@ -863,8 +863,7 @@
                  type="chrome_html" />
       <structure name="IDR_SETTINGS_COOKIES_PAGE_HTML"
                  file="privacy_page/cookies_page.html"
-                 type="chrome_html"
-                 preprocess="true" />
+                 type="chrome_html" />
       <structure name="IDR_SETTINGS_COOKIES_PAGE_JS"
                  file="privacy_page/cookies_page.js"
                  type="chrome_html" />

chrome/browser/resources/settings/settings_resources_v3.grdp

@@ -455,6 +455,10 @@
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/collapse_radio_button.m.js"
            use_base_dir="false"
            type="BINDATA" />
+  <include name="IDR_SETTINGS_PRIVACY_PAGE_COOKIES_PAGE_M_JS"
+           file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/cookies_page.m.js"
+           use_base_dir="false"
+           type="BINDATA" />
   <include name="IDR_SETTINGS_PRIVACY_PAGE_DO_NOT_TRACK_TOGGLE_M_JS"
            file="${root_gen_dir}/chrome/browser/resources/settings/privacy_page/do_not_track_toggle.m.js"
            use_base_dir="false"

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

@@ -79,7 +79,7 @@ cr.define('settings', function() {
    * components/content_settings/core/browser/cookie_settings.h
    * @enum {number}
    */
-  const CookieControlsMode = {
+  /* #export */ const CookieControlsMode = {
     DISABLED: 0,
     ENABLED: 1,
     INCOGNITO_ONLY: 2,

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

@@ -57,7 +57,7 @@ let ManagedState;
  *            blockAll: !ManagedState,
               sessionOnly: !ManagedState}}
  */
-let CookieControlsManagedState;
+/* #export */ let CookieControlsManagedState;
 
 /**
  * Stores origin information. The |hasPermissionSettings| will be set to true

chrome/test/data/webui/BUILD.gn

@@ -230,6 +230,7 @@ js2gtest("browser_tests_js_webui") {
     "$root_gen_dir/chrome/test/data/webui/settings/collapse_radio_button_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/controlled_button_tests.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/controlled_radio_button_tests.m.js",
+    "$root_gen_dir/chrome/test/data/webui/settings/cookies_page_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/do_not_track_toggle_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/downloads_page_test.m.js",
     "$root_gen_dir/chrome/test/data/webui/settings/dropdown_menu_tests.m.js",

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

@@ -24,6 +24,7 @@ js_modulizer("modulize") {
     "collapse_radio_button_tests.js",
     "controlled_button_tests.js",
     "controlled_radio_button_tests.js",
+    "cookies_page_test.js",
     "do_not_track_toggle_test.js",
     "downloads_page_test.js",
     "dropdown_menu_tests.js",

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

@@ -2,6 +2,16 @@
 // 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, SiteSettingsPrefsBrowserProxyImpl, CookieControlsMode, ContentSettingsTypes, SiteSettingSource} from 'chrome://settings/lazy_load.js';
+// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// #import {MetricsBrowserProxyImpl, PrivacyElementInteractions} from 'chrome://settings/settings.js';
+// #import {TestMetricsBrowserProxy} from 'chrome://test/settings/test_metrics_browser_proxy.m.js';
+// #import {TestSiteSettingsPrefsBrowserProxy} from 'chrome://test/settings/test_site_settings_prefs_browser_proxy.m.js';
+// #import {createRawSiteException, createDefaultContentSetting,createSiteSettingsPrefs,createContentSettingTypeToValuePair} from 'chrome://test/settings/test_util.m.js';
+// #import {isChildVisible, flushTasks} from 'chrome://test/test_util.m.js';
+// clang-format on
+
 suite('CrSettingsCookiesPageTest', function() {
   /** @type {TestSiteSettingsPrefsBrowserProxy} */
   let siteSettingsBrowserProxy;
@@ -214,7 +224,7 @@ suite('CrSettingsCookiesPageTest', function() {
   });
 
   test('CookieSettingExceptions_Search', async function() {
-    exceptionPrefs = test_util.createSiteSettingsPrefs([], [
+    const exceptionPrefs = test_util.createSiteSettingsPrefs([], [
       test_util.createContentSettingTypeToValuePair(
           settings.ContentSettingsTypes.COOKIES,
           [
@@ -275,7 +285,7 @@ suite('CrSettingsCookiesPageTest', function() {
     Polymer.dom.flush();
 
     // Check the four radio buttons are correctly indicating they are managed.
-    for (button of radioButtons) {
+    for (const button of radioButtons) {
       assertTrue(button.disabled);
       assertEquals(button.policyIndicatorType, 'devicePolicy');
     }
@@ -317,7 +327,7 @@ suite('CrSettingsCookiesPageTest', function() {
     await siteSettingsBrowserProxy.whenCalled('getCookieControlsManagedState');
 
     // Check the four radio buttons no longer indicate they are managed.
-    for (button of radioButtons) {
+    for (const button of radioButtons) {
       assertFalse(button.disabled);
       assertEquals(button.policyIndicatorType, 'none');
     }

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

@@ -310,6 +310,7 @@ TEST_F('CrSettingsPersonalizationOptionsV3Test', 'AllBuildsOld', function() {
  ['CollapseRadioButton', 'collapse_radio_button_tests.m.js'],
  ['ControlledButton', 'controlled_button_tests.m.js'],
  ['ControlledRadioButton', 'controlled_radio_button_tests.m.js'],
+ ['CookiesPage', 'cookies_page_test.m.js'],
  ['DoNotTrackToggle', 'do_not_track_toggle_test.m.js'],
  ['DownloadsPage', 'downloads_page_test.m.js'],
  ['DropdownMenu', 'dropdown_menu_tests.m.js'],