Remove unused flags related to optimization guide

Change-Id: Ia71d0f2f991527ca239e7c9bbb566299ece48f93
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3564677
Reviewed-by: Sophie Chang <sophiechang@chromium.org>
Commit-Queue: Tarun Bansal <tbansal@chromium.org>
Cr-Commit-Position: refs/heads/main@{#989161}

chrome/browser/about_flags.cc

@@ -3932,9 +3932,6 @@ const FeatureEntry kFeatureEntries[] = {
     {"isolation-by-default", flag_descriptions::kIsolationByDefaultName,
      flag_descriptions::kIsolationByDefaultDescription, kOsAll,
      SINGLE_VALUE_TYPE(switches::kIsolationByDefault)},
-    {"enable-login-detection", flag_descriptions::kEnableLoginDetectionName,
-     flag_descriptions::kEnableLoginDetectionDescription, kOsAll,
-     FEATURE_VALUE_TYPE(login_detection::kLoginDetection)},
     {"enable-google-srp-isolated-prerender-probing",
      flag_descriptions::kEnableSRPIsolatedPrerenderProbingName,
      flag_descriptions::kEnableSRPIsolatedPrerenderProbingDescription, kOsAll,
@@ -7450,21 +7447,10 @@ const FeatureEntry kFeatureEntries[] = {
                                     kTabSearchMediaTabsVariations,
                                     "TabSearchMediaTabs")},
 
-    {"enable-tflite-language-detection",
-     flag_descriptions::kTFLiteLanguageDetectionName,
-     flag_descriptions::kTFLiteLanguageDetectionDescription, kOsAll,
-     FEATURE_VALUE_TYPE(translate::kTFLiteLanguageDetectionEnabled)},
-
-    {"optimization-guide-model-downloading",
-     flag_descriptions::kOptimizationGuideModelDownloadingName,
-     flag_descriptions::kOptimizationGuideModelDownloadingDescription, kOsAll,
-     FEATURE_VALUE_TYPE(
-         optimization_guide::features::kOptimizationGuideModelDownloading)},
-
 #if BUILDFLAG(IS_ANDROID)
     {"optimization-guide-push-notifications",
-     flag_descriptions::kOptimizationGuideModelPushNotificationName,
-     flag_descriptions::kOptimizationGuideModelPushNotificationDescription,
+     flag_descriptions::kOptimizationGuidePushNotificationName,
+     flag_descriptions::kOptimizationGuidePushNotificationDescription,
      kOsAndroid,
      FEATURE_VALUE_TYPE(optimization_guide::features::kPushNotifications)},
 #endif

chrome/browser/flag-metadata.json

@@ -2314,11 +2314,6 @@
     // default because logs may contain PII.
     "expiry_milestone": -1
   },
-  {
-    "name": "enable-login-detection",
-    "owners": [ "rajendrant", "mcrouse", "tbansal" ],
-    "expiry_milestone": 92
-  },
   {
     "name": "enable-long-message-duration",
     "owners": [ "tinazwang", "bling-flags@google.com" ],
@@ -2430,21 +2425,6 @@
     "owners": [ "jophba@google.com", "openscreen-eng@google.com" ],
     "expiry_milestone": 105
   },
-  {
-    "name": "enable-optimization-guide",
-    "owners": [ "rajendrant", "robertogden", "chrome-intelligence-core@google.com" ],
-    "expiry_milestone": 100
-  },
-  {
-    "name": "enable-optimization-guide-metadata-validation",
-    "owners": [ "rajendrant", "robertogden", "chrome-intelligence-core@google.com"],
-    "expiry_milestone": 100
-  },
-  {
-    "name": "enable-optimization-hints-fetching-msbb",
-    "owners": [ "rajendrant", "robertogden", "chrome-intelligence-core@google.com" ],
-    "expiry_milestone": 100
-  },
   {
     "name": "enable-os-feedback",
     "owners": [ "xiangdongkong", "cros-feedback-app@google.com" ],
@@ -2697,11 +2677,6 @@
     "owners": [ "meiliang@chromium.org" ],
     "expiry_milestone": 97
   },
-  {
-    "name": "enable-subresource-redirect",
-    "owners": [ "rajendrant", "mcrouse", "tbansal" ],
-    "expiry_milestone": 92
-  },
   {
     "name": "enable-suggested-files",
     "owners": [ "wrong", "tby" ],
@@ -2797,11 +2772,6 @@
     "owners": [ "atotic@google.com" ],
     "expiry_milestone": 96
   },
-  {
-    "name": "enable-tflite-language-detection",
-    "owners": [ "mcrouse@chromium.org", "chrome-intelligence-core@google.com" ],
-    "expiry_milestone": 94
-  },
   {
     "name": "enable-throttle-display-none-and-visibility-hidden-cross-origin-iframes",
     "owners": [ "wjmaclean@chromium.org", "alexmos@chromium.org", "creis@chromium.org" ],
@@ -4551,15 +4521,10 @@
     "owners": [ "rajendrant", "robertogden", "chrome-intelligence-core@google.com" ],
     "expiry_milestone": 110
   },
-  {
-    "name": "optimization-guide-model-downloading",
-    "owners": [ "mcrouse", "chrome-intelligence-core@google.com" ],
-    "expiry_milestone": 95
-  },
   {
     "name": "optimization-guide-push-notifications",
     "owners": [ "robertogden", "chrome-intelligence-core@google.com" ],
-    "expiry_milestone": 103
+    "expiry_milestone": 109
   },
   {
     "name": "origin-agent-cluster-default",

chrome/browser/flag_descriptions.cc

@@ -1177,10 +1177,6 @@ const char kEnableLensStandaloneDescription[] =
     "Enables Lens image and region search to learn about the visual content "
     "you see while you browse and shop on the web.";
 
-const char kEnableLoginDetectionName[] = "Enable login detection";
-const char kEnableLoginDetectionDescription[] =
-    "Allow user sign-in to be detected based on heuristics.";
-
 const char kEnableManagedConfigurationWebApiName[] =
     "Enable Managed Configuration Web API";
 const char kEnableManagedConfigurationWebApiDescription[] =
@@ -1872,14 +1868,9 @@ const char kOptimizationGuideDebugLogsDescription[] =
     "Enables the optimization guide to log and save debug messages that can be "
     "shown in the internals page.";
 
-const char kOptimizationGuideModelDownloadingName[] =
-    "Allow optimization guide model downloads";
-const char kOptimizationGuideModelDownloadingDescription[] =
-    "Enables the optimization guide to download prediction models.";
-
-const char kOptimizationGuideModelPushNotificationName[] =
+const char kOptimizationGuidePushNotificationName[] =
     "Enable optimization guide push notifications";
-const char kOptimizationGuideModelPushNotificationDescription[] =
+const char kOptimizationGuidePushNotificationDescription[] =
     "Enables the optimization guide to receive push notifications.";
 
 const char kEnableDeJellyName[] = "Experimental de-jelly effect";

chrome/browser/flag_descriptions.h

@@ -636,9 +636,6 @@ extern const char kEnableLensStandaloneFlagId[];
 extern const char kEnableLensStandaloneName[];
 extern const char kEnableLensStandaloneDescription[];
 
-extern const char kEnableLoginDetectionName[];
-extern const char kEnableLoginDetectionDescription[];
-
 extern const char kEnableManagedConfigurationWebApiName[];
 extern const char kEnableManagedConfigurationWebApiDescription[];
 
@@ -1054,11 +1051,8 @@ extern const char kOmniboxDynamicMaxAutocompleteDescription[];
 extern const char kOptimizationGuideDebugLogsName[];
 extern const char kOptimizationGuideDebugLogsDescription[];
 
-extern const char kOptimizationGuideModelDownloadingName[];
-extern const char kOptimizationGuideModelDownloadingDescription[];
-
-extern const char kOptimizationGuideModelPushNotificationName[];
-extern const char kOptimizationGuideModelPushNotificationDescription[];
+extern const char kOptimizationGuidePushNotificationName[];
+extern const char kOptimizationGuidePushNotificationDescription[];
 
 extern const char kOsSettingsAppNotificationsPageName[];
 extern const char kOsSettingsAppNotificationsPageDescription[];

ios/chrome/browser/flags/about_flags.mm

@@ -515,23 +515,6 @@
      flag_descriptions::kEnableLongMessageDurationName,
      flag_descriptions::kEnableLongMessageDurationDescription, flags_ui::kOsIos,
      FEATURE_VALUE_TYPE(kEnableLongMessageDuration)},
-    {"enable-optimization-guide",
-     flag_descriptions::kEnableOptimizationGuideName,
-     flag_descriptions::kEnableOptimizationGuideDescription, flags_ui::kOsIos,
-     FEATURE_VALUE_TYPE(optimization_guide::features::kOptimizationHints)},
-    {"enable-optimization-guide-metadata-validation",
-     flag_descriptions::kEnableOptimizationGuideMetadataValidationName,
-     flag_descriptions::kEnableOptimizationGuideMetadataValidationDescription,
-     flags_ui::kOsIos,
-     FEATURE_VALUE_TYPE(
-         optimization_guide::features::kOptimizationGuideMetadataValidation)},
-    {"enable-optimization-hints-fetching-msbb",
-     flag_descriptions::kEnableOptimizationHintsFetchingMSBBName,
-     flag_descriptions::kEnableOptimizationHintsFetchingMSBBDescription,
-     flags_ui::kOsIos,
-     FEATURE_VALUE_TYPE(
-         optimization_guide::features::
-             kRemoteOptimizationGuideFetchingAnonymousDataConsent)},
 #if BUILDFLAG(IOS_SCREEN_TIME_ENABLED)
     {"screen-time-integration-ios",
      flag_descriptions::kScreenTimeIntegrationName,

ios/chrome/browser/flags/ios_chrome_flag_descriptions.cc

@@ -226,22 +226,6 @@ const char kEnableNewDownloadAPIName[] = "Enable new download API";
 const char kEnableNewDownloadAPIDescription[] =
     "Enable new download API (restricted to iOS 15.0+).";
 
-const char kEnableOptimizationGuideName[] = "Enable optimization guide";
-const char kEnableOptimizationGuideDescription[] =
-    "Enables the optimization guide to provide intelligence for page loads.";
-
-const char kEnableOptimizationGuideMetadataValidationName[] =
-    "Enable optimization guide metadata validation";
-const char kEnableOptimizationGuideMetadataValidationDescription[] =
-    "Enables the validation of optimization guide metadata fetch and "
-    "allowlist/blocklist bloom filter.";
-
-const char kEnableOptimizationHintsFetchingMSBBName[] =
-    "Enable MSBB optimization hints fetching";
-const char kEnableOptimizationHintsFetchingMSBBDescription[] =
-    "Enable optimization hints fetching for users who have enabled the 'Make "
-    "Searches and Browsing Better' setting.";
-
 const char kEnableUnicornAccountSupportName[] =
     "Enable Unicorn account support";
 const char kEnableUnicornAccountSupportDescription[] =

ios/chrome/browser/flags/ios_chrome_flag_descriptions.h

@@ -208,20 +208,6 @@ extern const char kEnableLongMessageDurationDescription[];
 extern const char kEnableNewDownloadAPIName[];
 extern const char kEnableNewDownloadAPIDescription[];
 
-// Title and description for the flag to enable optimization guide.
-extern const char kEnableOptimizationGuideName[];
-extern const char kEnableOptimizationGuideDescription[];
-
-// Title and description for the flag to enable optimization guide metadata
-// validation.
-extern const char kEnableOptimizationGuideMetadataValidationName[];
-extern const char kEnableOptimizationGuideMetadataValidationDescription[];
-
-// Title and description for the flag to enable optimization guide hints
-// fetching for MSBB users.
-extern const char kEnableOptimizationHintsFetchingMSBBName[];
-extern const char kEnableOptimizationHintsFetchingMSBBDescription[];
-
 // Title and description for the flag to enable shorted password auto-fill
 // instructions and button.
 extern const char kEnableShortenedPasswordAutoFillInstructionName[];