Avoid passing unifiedConsentEnabled value to settings javascript code.

This CL avoids passing the unifiedConsentEnabled as a loadtime variable to
the Chrome desktop settings javascript code.

A follow-up CL will also remove the "unified-consent-enabled" argument
from all JavaScript settings files.

Bug: 1015805

Change-Id: I3d6bf2deb1b0123129b8f8f3c665ed4277e5a495
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1869657
Commit-Queue: Mihai Sardarescu <msarda@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Thomas Tangl <tangltom@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709022}

chrome/app/settings_chromium_strings.grdp

@@ -74,9 +74,6 @@
   </if>
 
   <!-- Privacy Page -->
-  <message name="IDS_SETTINGS_IMPROVE_BROWSING_EXPERIENCE" desc="The text in the options panel that describes how we use web services to improve browsing experience.">
-    Chromium may use web services to improve your browsing experience. You may optionally disable these services. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>
-  </message>
   <message name="IDS_SETTINGS_SPELLING_PREF_DESC" desc="Description of using a web serviced to help resolve spelling errors. It is important to convey that what the user types will be sent to Google.">
     To fix spelling errors, Chromium sends the text you type in text fields to Google
   </message>

chrome/app/settings_google_chrome_strings.grdp

@@ -74,9 +74,6 @@
   </if>
 
   <!-- Privacy Page -->
-  <message name="IDS_SETTINGS_IMPROVE_BROWSING_EXPERIENCE" desc="The text in the options panel that describes how we use web services to improve browsing experience.">
-    Google Chrome may use web services to improve your browsing experience. You may optionally disable these services. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>
-  </message>
   <message name="IDS_SETTINGS_SPELLING_PREF_DESC" desc="Description of using a web serviced to help resolve spelling errors. It is important to convey that what the user types will be sent to Google.">
     To fix spelling errors, Chrome sends the text you type in the browser to Google
   </message>

chrome/browser/resources/settings/people_page/people_page.html

@@ -146,7 +146,7 @@
         <template is="dom-if" if="[[shouldShowSyncAccountControl_(diceEnabled_,
             syncStatus.syncSystemEnabled, syncStatus.signinAllowed)]]">
           <settings-sync-account-control
-              unified-consent-enabled="[[unifiedConsentEnabled_]]"
+              unified-consent-enabled
               sync-status="[[syncStatus]]"
               promo-label-with-account="$i18n{peopleSignInPrompt}"
               promo-label-with-no-account="$i18n{peopleSignInPrompt}"
@@ -228,25 +228,11 @@
 </if>
         </template>
 
-        <template is="dom-if"
-            if="[[isPreUnifiedConsentAdvancedSyncSettingsVisible_(
-                syncStatus, unifiedConsentEnabled_)]]">
-          <cr-link-row id="sync-status"
-              class$="[[getSyncStatusClass_(syncStatus)]]"
-              label="$i18n{syncAndNonPersonalizedServices}"
-              sub-label="[[getSyncAndGoogleServicesSubtext_(syncStatus)]]"
-              on-click="onSyncTap_" start-icon="[[getSyncIcon_(syncStatus)]]"
-              actionable$="[[isSyncStatusActionable_(syncStatus)]]">
-          </cr-link-row>
-        </template>
-
-        <template is="dom-if" if="[[unifiedConsentEnabled_]]">
-          <cr-link-row id="sync-setup"
-              label="$i18n{syncAndNonPersonalizedServices}"
-              sub-label="[[getSyncAndGoogleServicesSubtext_(syncStatus)]]"
-              on-click="onSyncTap_">
-          </cr-link-row>
-        </template>
+        <cr-link-row id="sync-setup"
+            label="$i18n{syncAndNonPersonalizedServices}"
+            sub-label="[[getSyncAndGoogleServicesSubtext_(syncStatus)]]"
+            on-click="onSyncTap_">
+        </cr-link-row>
 
 <if expr="not chromeos">
         <template is="dom-if" if="[[diceEnabled_]]">
@@ -305,36 +291,29 @@
 </if>
 
       </div>
-      <template is="dom-if" route-path="/syncSetup"
-          no-search="[[!isAdvancedSyncSettingsSearchable_(
-              syncStatus, unifiedConsentEnabled_)]]">
+      <template is="dom-if" route-path="/syncSetup">
         <settings-subpage
-            associated-control="[[getAdvancedSyncSettingsAssociatedControl_(
-                unifiedConsentEnabled_)]]"
+            associated-control="[[$$('#sync-setup')]"
             page-title="$i18n{syncPageTitle}"
-            learn-more-url="$i18n{syncAndGoogleServicesLearnMoreURL}"
-            no-search$="[[!isAdvancedSyncSettingsSearchable_(syncStatus,
-                unifiedConsentEnabled_)]]">
+            learn-more-url="$i18n{syncAndGoogleServicesLearnMoreURL}">
           <settings-sync-page
 <if expr="not chromeos">
               dice-enabled="[[diceEnabled_]]"
 </if>
-              unified-consent-enabled="[[unifiedConsentEnabled_]]"
+              unified-consent-enabled
               sync-status="[[syncStatus]]" prefs="{{prefs}}"
               page-visibility="[[pageVisibility.privacy]]">
           </settings-sync-page>
         </settings-subpage>
       </template>
 
-      <template is="dom-if" if="[[unifiedConsentEnabled_]]">
-        <template is="dom-if" route-path="/syncSetup/advanced">
-          <settings-subpage page-title="$i18n{syncAdvancedPageTitle}"
-              associated-control="[[$$('#sync-setup')]]"
-              learn-more-url="$i18n{syncAndGoogleServicesLearnMoreURL}">
-            <settings-sync-controls sync-status="[[syncStatus]]">
-            </settings-sync-controls>
-          </settings-subpage>
-        </template>
+      <template is="dom-if" route-path="/syncSetup/advanced">
+        <settings-subpage page-title="$i18n{syncAdvancedPageTitle}"
+            associated-control="[[$$('#sync-setup')]]"
+            learn-more-url="$i18n{syncAndGoogleServicesLearnMoreURL}">
+          <settings-sync-controls sync-status="[[syncStatus]]">
+          </settings-sync-controls>
+        </settings-subpage>
       </template>
 
 <if expr="chromeos">

chrome/browser/resources/settings/people_page/people_page.js

@@ -39,23 +39,7 @@ Polymer({
         return loadTimeData.getBoolean('diceEnabled');
       },
     },
-    // </if>
 
-    /**
-     * This flag is used to conditionally show a set of sync UIs to the
-     * profiles that have been migrated to have a unified consent flow.
-     * TODO(tangltom): In the future when all profiles are completely migrated,
-     * this should be removed, and UIs hidden behind it should become default.
-     * @private
-     */
-    unifiedConsentEnabled_: {
-      type: Boolean,
-      value: function() {
-        return loadTimeData.getBoolean('unifiedConsentEnabled');
-      },
-    },
-
-    // <if expr="not chromeos">
     /**
      * Stored accounts to the system, supplied by SyncBrowserProxy.
      * @type {?Array<!settings.StoredAccount>}
@@ -200,11 +184,7 @@ Polymer({
       value: function() {
         const map = new Map();
         if (settings.routes.SYNC) {
-          map.set(
-              settings.routes.SYNC.path,
-              loadTimeData.getBoolean('unifiedConsentEnabled') ?
-                  '#sync-setup' :
-                  '#sync-status');
+          map.set(settings.routes.SYNC.path, '#sync-setup');
         }
         // <if expr="not chromeos">
         if (settings.routes.MANAGE_PROFILE) {
@@ -466,50 +446,8 @@ Polymer({
 
   /** @private */
   onSyncTap_: function() {
-    // When unified-consent is enabled, users can go to sync subpage regardless
-    // of sync status.
-    if (this.unifiedConsentEnabled_) {
-      settings.navigateTo(settings.routes.SYNC);
-      return;
-    }
-
-    // TODO(crbug.com/862983): Remove this code once UnifiedConsent is rolled
-    // out to 100%.
-    assert(this.syncStatus.signedIn);
-    assert(this.syncStatus.syncSystemEnabled);
-
-    if (!this.isSyncStatusActionable_(this.syncStatus)) {
-      return;
-    }
-
-    switch (this.syncStatus.statusAction) {
-      case settings.StatusAction.REAUTHENTICATE:
-        this.syncBrowserProxy_.startSignIn();
-        break;
-      case settings.StatusAction.SIGNOUT_AND_SIGNIN:
-        // <if expr="chromeos">
-        this.syncBrowserProxy_.attemptUserExit();
-        // </if>
-        // <if expr="not chromeos">
-        if (this.syncStatus.domain) {
-          settings.navigateTo(settings.routes.SIGN_OUT);
-        } else {
-          // Silently sign the user out without deleting their profile and
-          // prompt them to sign back in.
-          this.syncBrowserProxy_.signOut(false);
-          this.syncBrowserProxy_.startSignIn();
-        }
-        // </if>
-        break;
-      case settings.StatusAction.UPGRADE_CLIENT:
-        settings.navigateTo(settings.routes.ABOUT);
-        break;
-      case settings.StatusAction.ENTER_PASSPHRASE:
-      case settings.StatusAction.CONFIRM_SYNC_SETTINGS:
-      case settings.StatusAction.NO_ACTION:
-      default:
-        settings.navigateTo(settings.routes.SYNC);
-    }
+    // Users can go to sync subpage regardless of sync status.
+    settings.navigateTo(settings.routes.SYNC);
   },
 
   // <if expr="chromeos">
@@ -583,90 +521,6 @@ Polymer({
   },
   // </if>
 
-  /**
-   * @private
-   * @param {?settings.SyncStatus} syncStatus
-   * @return {boolean}
-   */
-  isPreUnifiedConsentAdvancedSyncSettingsVisible_: function(syncStatus) {
-    return !!syncStatus && !!syncStatus.signedIn &&
-        !!syncStatus.syncSystemEnabled && !this.unifiedConsentEnabled_;
-  },
-
-  /**
-   * @private
-   * @param {?settings.SyncStatus} syncStatus
-   * @return {boolean}
-   */
-  isAdvancedSyncSettingsSearchable_: function(syncStatus) {
-    return this.isPreUnifiedConsentAdvancedSyncSettingsVisible_(syncStatus) ||
-        !!this.unifiedConsentEnabled_;
-  },
-
-  /**
-   * @private
-   * @return {Element|null}
-   */
-  getAdvancedSyncSettingsAssociatedControl_: function() {
-    return this.unifiedConsentEnabled_ ? this.$$('#sync-setup') :
-                                         this.$$('#sync-status');
-  },
-
-  /**
-   * @private
-   * @param {?settings.SyncStatus} syncStatus
-   * @return {boolean} Whether an action can be taken with the sync status. sync
-   *     status is actionable if sync is not managed and if there is a sync
-   *     error, there is an action associated with it.
-   */
-  isSyncStatusActionable_: function(syncStatus) {
-    return !!syncStatus && !syncStatus.managed &&
-        (!syncStatus.hasError ||
-         syncStatus.statusAction != settings.StatusAction.NO_ACTION);
-  },
-
-  /**
-   * @private
-   * @param {?settings.SyncStatus} syncStatus
-   * @return {string}
-   */
-  getSyncIcon_: function(syncStatus) {
-    if (!syncStatus) {
-      return '';
-    }
-
-    let syncIcon = 'cr:sync';
-
-    if (syncStatus.hasError) {
-      syncIcon = 'settings:sync-problem';
-    }
-
-    // Override the icon to the disabled icon if sync is managed.
-    if (syncStatus.managed ||
-        syncStatus.statusAction == settings.StatusAction.REAUTHENTICATE) {
-      syncIcon = 'settings:sync-disabled';
-    }
-
-    return syncIcon;
-  },
-
-  /**
-   * @private
-   * @param {?settings.SyncStatus} syncStatus
-   * @return {string} The class name for the sync status row.
-   */
-  getSyncStatusClass_: function(syncStatus) {
-    if (syncStatus && syncStatus.hasError) {
-      // Most of the time re-authenticate states are caused by intentional user
-      // action, so they will be displayed differently as other errors.
-      return syncStatus.statusAction == settings.StatusAction.REAUTHENTICATE ?
-          'auth-error' :
-          'sync-error';
-    }
-
-    return 'no-error';
-  },
-
   /**
    * @param {string} iconUrl
    * @return {string} A CSS image-set for multiple scale factors.

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

@@ -39,7 +39,6 @@
   <link rel="import" href="chrome://resources/cr_components/certificate_manager/certificate_manager.html">
 </if>
 <link rel="import" href="privacy_page_browser_proxy.html">
-<link rel="import" href="personalization_options.html">
 
 <dom-module id="settings-privacy-page">
   <template>
@@ -83,17 +82,10 @@
     <settings-animated-pages id="pages" section="privacy"
         focus-config="[[focusConfig_]]">
       <div route-path="default">
-        <template is="dom-if" if="[[!unifiedConsentEnabled_]]">
-          <div class="settings-box first">
-            <p class="privacy-explanation">
-              $i18nRaw{improveBrowsingExperience}
-            </p>
-          </div>
-        </template>
         <cr-link-row label="$i18n{syncAndNonPersonalizedServices}"
             sub-label="$i18n{syncAndGoogleServicesPrivacyDescription}"
-            on-click="onSyncAndGoogleServicesClick_"
-            hidden="[[!unifiedConsentEnabled_]]"></cr-link-row>
+            on-click="onSyncAndGoogleServicesClick_">
+        </cr-link-row>
 <if expr="not chromeos">
         <settings-toggle-button id="signinAllowedToggle"
             pref="{{prefs.signin.allowed_on_next_startup}}"
@@ -103,12 +95,6 @@
             no-set-pref>
         </settings-toggle-button>
 </if><!-- not chromeos -->
-        <template is="dom-if" if="[[!unifiedConsentEnabled_]]">
-          <settings-personalization-options prefs="{{prefs}}"
-              page-visibility="[[pageVisibility]]"
-              unified-consent-enabled="[[unifiedConsentEnabled_]]">
-          </settings-personalization-options>
-        </template>
         <settings-toggle-button id="doNotTrack"
             pref="{{prefs.enable_do_not_track}}" label="$i18n{doNotTrack}"
             on-settings-boolean-control-change="onDoNotTrackChange_"

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

@@ -208,20 +208,6 @@ Polymer({
       },
     },
 
-    /**
-     * This flag is used to conditionally show a set of sync UIs to the
-     * profiles that have been migrated to have a unified consent flow.
-     * TODO(tangltom): In the future when all profiles are completely migrated,
-     * this should be removed, and UIs hidden behind it should become default.
-     * @private
-     */
-    unifiedConsentEnabled_: {
-      type: Boolean,
-      value: function() {
-        return loadTimeData.getBoolean('unifiedConsentEnabled');
-      },
-    },
-
     // <if expr="not chromeos">
     /** @private */
     showRestart_: Boolean,

chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc

@@ -2532,15 +2532,6 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
 
   html_source->AddString("syncAndGoogleServicesLearnMoreURL",
                          chrome::kSyncAndGoogleServicesLearnMoreURL);
-  html_source->AddString(
-      "improveBrowsingExperience",
-      l10n_util::GetStringFUTF16(
-          IDS_SETTINGS_IMPROVE_BROWSING_EXPERIENCE,
-#if defined(OS_CHROMEOS)
-          GetHelpUrlWithBoard(chrome::kPrivacyLearnMoreURL)));
-#else
-          base::ASCIIToUTF16(chrome::kPrivacyLearnMoreURL)));
-#endif
   html_source->AddString(
       "doNotTrackDialogMessage",
       l10n_util::GetStringFUTF16(

chrome/browser/ui/webui/settings/settings_ui.cc

@@ -262,9 +262,6 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
       "privacySettingsRedesignEnabled",
       base::FeatureList::IsEnabled(features::kPrivacySettingsRedesign));
 
-  // TODO(msarda): Remove |unifiedConsentEnabled| from all settings resources.
-  html_source->AddBoolean("unifiedConsentEnabled", true);
-
   html_source->AddBoolean(
       "navigateToGooglePasswordManager",
       ShouldManagePasswordsinGooglePasswordManager(profile));

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

@@ -29,9 +29,6 @@ cr.define('settings_people_page', function() {
       loadTimeData.overrideValues({
         // Force Dice off. Dice is tested in the DiceUITest suite.
         diceEnabled: false,
-        // Force Unified Consent off. Unified Consent is tested in the
-        // UnifiedConsentUITest suite.
-        unifiedConsentEnabled: false,
       });
       if (cr.isChromeOS) {
         loadTimeData.overrideValues({
@@ -80,17 +77,6 @@ cr.define('settings_people_page', function() {
       const newBg = peoplePage.$$('#profile-icon').style.backgroundImage;
       assertTrue(newBg.includes(iconDataUrl));
     });
-
-    // This test ensures when unifiedConsentEnabled and diceEnabled is false,
-    // the #sync-status row is shown instead of the #sync-setup row.
-    test('ShowCorrectSyncRow', function() {
-      sync_test_util.simulateSyncStatus({
-        signedIn: true,
-        syncSystemEnabled: true,
-      });
-      assertFalse(!!peoplePage.$$('#sync-setup'));
-      assertTrue(!!peoplePage.$$('#sync-status'));
-    });
   });
 
   if (!cr.isChromeOS) {
@@ -324,63 +310,6 @@ cr.define('settings_people_page', function() {
               return popstatePromise;
             });
       });
-
-      test('syncStatusNotActionableForManagedAccounts', function() {
-        assertFalse(!!peoplePage.$$('#sync-status'));
-
-        return browserProxy.whenCalled('getSyncStatus').then(function() {
-          sync_test_util.simulateSyncStatus({
-            signedIn: true,
-            syncSystemEnabled: true,
-          });
-          Polymer.dom.flush();
-
-          let syncStatusContainer = peoplePage.$$('#sync-status');
-          assertTrue(!!syncStatusContainer);
-          assertTrue(syncStatusContainer.hasAttribute('actionable'));
-
-          sync_test_util.simulateSyncStatus({
-            managed: true,
-            signedIn: true,
-            syncSystemEnabled: true,
-          });
-          Polymer.dom.flush();
-
-          syncStatusContainer = peoplePage.$$('#sync-status');
-          assertTrue(!!syncStatusContainer);
-          assertFalse(syncStatusContainer.hasAttribute('actionable'));
-        });
-      });
-
-      test('syncStatusNotActionableForPassiveErrors', function() {
-        assertFalse(!!peoplePage.$$('#sync-status'));
-
-        return browserProxy.whenCalled('getSyncStatus').then(function() {
-          sync_test_util.simulateSyncStatus({
-            hasError: true,
-            statusAction: settings.StatusAction.NO_ACTION,
-            signedIn: true,
-            syncSystemEnabled: true,
-          });
-          Polymer.dom.flush();
-
-          let syncStatusContainer = peoplePage.$$('#sync-status');
-          assertTrue(!!syncStatusContainer);
-          assertFalse(syncStatusContainer.hasAttribute('actionable'));
-
-          sync_test_util.simulateSyncStatus({
-            hasError: true,
-            statusAction: settings.StatusAction.UPGRADE_CLIENT,
-            signedIn: true,
-            syncSystemEnabled: true,
-          });
-          Polymer.dom.flush();
-
-          syncStatusContainer = peoplePage.$$('#sync-status');
-          assertTrue(!!syncStatusContainer);
-          assertTrue(syncStatusContainer.hasAttribute('actionable'));
-        });
-      });
     });
 
     suite('DiceUITest', function() {
@@ -520,21 +449,10 @@ cr.define('settings_people_page', function() {
               'none', window.getComputedStyle(manageGoogleAccount)['display']);
         });
       });
-
-      // This test ensures when diceEnabled is true, but unifiedConsentEnabled
-      // is false, the #sync-status row is shown instead of the #sync-setup row.
-      test('ShowCorrectSyncRowWithDice', function() {
-        sync_test_util.simulateSyncStatus({
-          signedIn: true,
-          syncSystemEnabled: true,
-        });
-        assertFalse(!!peoplePage.$$('#sync-setup'));
-        assertTrue(!!peoplePage.$$('#sync-status'));
-      });
     });
   }
 
-  suite('UnifiedConsentUITest', function() {
+  suite('SyncSettings', function() {
     /** @type {SettingsPeoplePageElement} */
     let peoplePage = null;
     /** @type {settings.SyncBrowserProxy} */
@@ -542,15 +460,7 @@ cr.define('settings_people_page', function() {
     /** @type {settings.ProfileInfoBrowserProxy} */
     let profileInfoBrowserProxy = null;
 
-    suiteSetup(function() {
-      // Force UIs to think DICE is enabled for this profile.
-      loadTimeData.overrideValues({
-        diceEnabled: true,
-        unifiedConsentEnabled: true,
-      });
-    });
-
-    setup(function() {
+    setup(async function() {
       browserProxy = new TestSyncBrowserProxy();
       settings.SyncBrowserProxyImpl.instance_ = browserProxy;
 
@@ -562,15 +472,15 @@ cr.define('settings_people_page', function() {
       peoplePage.pageVisibility = settings.pageVisibility;
       document.body.appendChild(peoplePage);
 
+      await browserProxy.whenCalled('getSyncStatus');
       Polymer.dom.flush();
-      return browserProxy.whenCalled('getSyncStatus');
     });
 
     teardown(function() {
       peoplePage.remove();
     });
 
-    test('ShowCorrectSyncRowWithUnifiedConsent', function() {
+    test('ShowCorrectSyncRow', function() {
       assertTrue(!!peoplePage.$$('#sync-setup'));
       assertFalse(!!peoplePage.$$('#sync-status'));