Reland "Move Password Leak detection setting from Google Services to Privacy"

This reverts commit 51486136.

Reason for revert: Assertions added in the Previous CL failed because of incorrect assumptions about the state of flags in tests. The state of this flag has been explicitly set in the two tests causing the failure.

TBR=dpapad@chromium.org,msramek@chromium.org,jdoerrie@chromium.org, karandeepb@chromium.org

Original change's description:
> Revert "Move Password Leak detection setting from Google Services to Privacy"
>
> This reverts commit 83db5b46.
>
> Reason for revert: Suspected to break CrSettingsPrivacyPageTest.PrivacySettingsRedesignTests
> CrSettingsPersonalizationOptionsTest.AllBuilds
> browser_tests on linux-chromeos-google-rel
>
> Original change's description:
> > Move Password Leak detection setting from Google Services to Privacy
> >
> > Along with the elevation of the Privacy card out of advanced, the toggle
> > for enabling Password Leak detection is being moved from the Sync and
> > Other Google services page into the privacy page.
> >
> > This aligns the location of the Passwork Leak detection toggle with the
> > Safe Browsing settings already moved to the Privacy page.
> >
> > Every change in behavior is behind the privacySettingsRedesignEnabled
> > finch flag.
> >
> > Bug: 1014143
> > Change-Id: Icd604d38729cdae113c116c77079cad9b874cd3f
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1946470
> > Commit-Queue: Theodore Olsauskas-Warren <sauski@google.com>
> > Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
> > Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#722065}
>
> TBR=dpapad@chromium.org,msramek@chromium.org,jdoerrie@chromium.org,sauski@google.com
>
> Change-Id: If9b0c66e68aadc093ed4dbb0f367c4a05878eab4
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1014143, 1031237
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1954003
> Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
> Commit-Queue: Karan Bhatia <karandeepb@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#722144}

Change-Id: I20f4d205da0a76c6deefe858f4d71afee2edcb68
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1014143, 1031237
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1954397Reviewed-by: Martin Šrámek <msramek@chromium.org>
Commit-Queue: Theodore Olsauskas-Warren <sauski@google.com>
Cr-Commit-Position: refs/heads/master@{#722453}

chrome/browser/resources/settings/privacy_page/passwords_leak_detection_toggle.html

@@ -12,9 +12,9 @@
 <dom-module id="settings-passwords-leak-detection-toggle">
   <template>
     <style>
-      settings-toggle-button {
-        padding-inline-end: 0;
-        padding-inline-start: 0;
+      :host-context(.list-frame) settings-toggle-button {
+          padding-inline-end: 0;
+          padding-inline-start: 0;
       }
     </style>
     <settings-toggle-button id="passwordsLeakDetectionCheckbox"

chrome/browser/resources/settings/privacy_page/personalization_options.html

@@ -64,13 +64,13 @@
           label="$i18n{safeBrowsingEnableProtection}"
           sub-label="$i18n{safeBrowsingEnableProtectionDesc}">
       </settings-toggle-button>
-    </template>
-    <template is="dom-if" if="[[passwordsLeakDetectionEnabled_]]">
-      <settings-passwords-leak-detection-toggle prefs="{{prefs}}"
-          sync-status="[[syncStatus]]">
-      </settings-passwords-leak-detection-toggle>
-    </template>
-    <template is="dom-if" if="[[!privacySettingsRedesignEnabled_]]">
+      <template is="dom-if" if="[[passwordsLeakDetectionEnabled_]]">
+        <settings-passwords-leak-detection-toggle
+            id="passwordsLeakDetectionToggle"
+            prefs="{{prefs}}"
+            sync-status="[[syncStatus]]">
+        </settings-passwords-leak-detection-toggle>
+      </template>
       <settings-toggle-button id="safeBrowsingReportingToggle"
           pref="{{prefs.safebrowsing.scout_reporting_enabled}}"
           checked="[[getCheckedExtendedSafeBrowsing_(prefs.*)]]"

chrome/browser/resources/settings/privacy_page/personalization_options.js

@@ -35,7 +35,9 @@ Polymer({
     /** @private */
     passwordsLeakDetectionEnabled_: {
       type: Boolean,
-      value: loadTimeData.getBoolean('passwordsLeakDetectionEnabled'),
+      value: function() {
+        return loadTimeData.getBoolean('passwordsLeakDetectionEnabled');
+      },
     },
 
     // <if expr="_google_chrome and not chromeos">

chrome/browser/resources/settings/privacy_page/privacy_page.html

@@ -8,6 +8,7 @@
 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
+<link rel="import" href="passwords_leak_detection_toggle.html">
 <link rel="import" href="security_keys_subpage.html">
 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialog.html">
 <link rel="import" href="../controls/settings_toggle_button.html">
@@ -95,6 +96,13 @@
               label="$i18n{safeBrowsingEnableProtection}"
               sub-label="$i18n{safeBrowsingEnableProtectionDesc}">
           </settings-toggle-button>
+          <template is="dom-if" if="[[passwordsLeakDetectionEnabled_]]">
+            <settings-passwords-leak-detection-toggle
+                id="passwordsLeakDetectionToggle"
+                prefs="{{prefs}}"
+                sync-status="[[syncStatus]]">
+            </settings-passwords-leak-detection-toggle>
+          </template>
           <settings-toggle-button id="safeBrowsingReportingToggle"
               pref="{{prefs.safebrowsing.scout_reporting_enabled}}"
               label="$i18n{safeBrowsingEnableExtendedReporting}"

chrome/browser/resources/settings/privacy_page/privacy_page.js

@@ -60,6 +60,14 @@ Polymer({
      */
     pageVisibility: Object,
 
+    /** @private */
+    passwordsLeakDetectionEnabled_: {
+      type: Boolean,
+      value: function() {
+        return loadTimeData.getBoolean('passwordsLeakDetectionEnabled');
+      },
+    },
+
     /** @private */
     isGuest_: {
       type: Boolean,

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

@@ -25,6 +25,7 @@ cr.define('settings_personalization_options', function() {
     suiteSetup(function() {
       loadTimeData.overrideValues({
         driveSuggestAvailable: true,
+        passwordsLeakDetectionEnabled: true,
       });
     });
 
@@ -71,8 +72,8 @@ cr.define('settings_personalization_options', function() {
       // flag remain visible when the flag is in the default state
       assertFalse(loadTimeData.getBoolean('privacySettingsRedesignEnabled'));
       assertVisible(testElement.$$('#safeBrowsingToggle'), true);
+      assertVisible(testElement.$$('#passwordsLeakDetectionToggle'), true);
       assertVisible(testElement.$$('#safeBrowsingReportingToggle'), true);
-
       assertFalse(!!testElement.$$('#signinAllowedToggle'));
     });
   });
@@ -115,6 +116,7 @@ cr.define('settings_personalization_options', function() {
     test('PrivacySettingsRedesignEnabled_True', function() {
       Polymer.dom.flush();
       assertFalse(!!page.$$('#safeBrowsingToggle'));
+      assertFalse(!!page.$$('#passwordsLeakDetectionToggle'));
       assertFalse(!!page.$$('#safeBrowsingReportingToggle'));
     });
 

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

@@ -241,6 +241,7 @@ cr.define('settings_privacy_page', function() {
 
         // These elements should not even be present in the DOM
         assertFalse(!!page.$$('#safeBrowsingToggle'));
+        assertFalse(!!page.$$('#passwordsLeakDetectionToggle'));
         assertFalse(!!page.$$('#safeBrowsingReportingToggle'));
       });
 
@@ -343,6 +344,7 @@ cr.define('settings_privacy_page', function() {
       suiteSetup(function() {
         loadTimeData.overrideValues({
           privacySettingsRedesignEnabled: true,
+          passwordsLeakDetectionEnabled: true,
         });
       });
 
@@ -364,6 +366,7 @@ cr.define('settings_privacy_page', function() {
         assertFalse(!!page.$$('#signinAllowedToggle'));
 
         assertVisible(page.$$('#safeBrowsingToggle'), true);
+        assertVisible(page.$$('#passwordsLeakDetectionToggle'), true);
         assertVisible(page.$$('#safeBrowsingReportingToggle'), true);
       });
     });