commit 4e0907da225c5602626ad9f8dfd27bf1eb276d74
author Roman Sorokin <rsorokin@chromium.org> Tue Sep 27 09:04:09 2022
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Sep 27 09:04:09 2022
tree 7fbf1d154073dfae623203bdf62cf7f19790aa53
parent da4369a9d9d845e53765df462cae5d3856ace093

[Cleanup] Remove obsolete SyncSettingsCategorization code

Remove the obsolete code which is executed when
IsSyncSettingsCategorizationEnabled is false.
The feature has been enabled for a while now.
We removed the flag recently: http://crrev.com/c/3859278

This CL was uploaded by git cl split.

R=sauski@google.com

Bug: 1227417, 1249845
Test: CQ
Change-Id: I90a7fab8e17653f7e05d23890596e7e5ea01aa5c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3918293
Commit-Queue: Theodore Olsauskas-Warren <sauski@google.com>
Reviewed-by: Theodore Olsauskas-Warren <sauski@google.com>
Auto-Submit: Roman Sorokin <rsorokin@google.com>
Cr-Commit-Position: refs/heads/main@{#1051688}

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

diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.ts b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
index 359b1f66..25cc81c 100644
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
@@ -158,8 +158,7 @@
 
   private showPriceEmailNotificationsToggle_(): boolean {
     // <if expr="chromeos_ash">
-    if (loadTimeData.getBoolean('syncSettingsCategorizationEnabled') &&
-        loadTimeData.getBoolean('isOSSettings')) {
+    if (loadTimeData.getBoolean('isOSSettings')) {
       // Should be hidden in OS settings.
       return false;
     }
@@ -244,8 +243,7 @@
 
   private showSearchSuggestToggle_(): boolean {
     // <if expr="chromeos_ash">
-    if (loadTimeData.getBoolean('syncSettingsCategorizationEnabled') &&
-        loadTimeData.getBoolean('isOSSettings')) {
+    if (loadTimeData.getBoolean('isOSSettings')) {
       // Should be hidden in OS settings.
       return false;
     }
@@ -259,10 +257,7 @@
 
   // <if expr="chromeos_ash">
   private showMetricsReportingAsLink_(): boolean {
-    // If SyncSettingsCategorization is enabled, browser settings should show
-    // a link to the OS settings.
-    return loadTimeData.getBoolean('syncSettingsCategorizationEnabled') &&
-        !loadTimeData.getBoolean('isOSSettings');
+    return !loadTimeData.getBoolean('isOSSettings');
   }
 
   private onMetricsReportingLinkClick_() {
@@ -272,9 +267,9 @@
 
   private showUrlCollectionToggle_(): boolean {
     // <if expr="chromeos_ash">
-    if (loadTimeData.getBoolean('syncSettingsCategorizationEnabled')) {
-      // Should be hidden in OS settings.
-      return !loadTimeData.getBoolean('isOSSettings');
+    // Should be hidden in OS settings.
+    if (loadTimeData.getBoolean('isOSSettings')) {
+      return false;
     }
     // </if>
     return true;
@@ -291,8 +286,7 @@
 
   private showSpellCheckControlToggle_(): boolean {
     // <if expr="chromeos_ash">
-    if (loadTimeData.getBoolean('syncSettingsCategorizationEnabled') &&
-        !loadTimeData.getBoolean('isOSSettings')) {
+    if (!loadTimeData.getBoolean('isOSSettings')) {
       // The toggle should be hidden in Ash Browser settings page
       // (it shows a link to the OS Settings page instead).
       return false;
@@ -305,9 +299,6 @@
 
   // <if expr="chromeos_ash">
   private showSpellCheckControlLink_(): boolean {
-    if (!loadTimeData.getBoolean('syncSettingsCategorizationEnabled')) {
-      return false;
-    }
     if (loadTimeData.getBoolean('isOSSettings')) {
       return false;  // Should be hidden in OS settings.
     }
@@ -324,8 +315,7 @@
 
   private shouldShowDriveSuggest_(): boolean {
     // <if expr="chromeos_ash">
-    if (loadTimeData.getBoolean('syncSettingsCategorizationEnabled') &&
-        loadTimeData.getBoolean('isOSSettings')) {
+    if (loadTimeData.getBoolean('isOSSettings')) {
       // Should be hidden in OS settings.
       return false;
     }