Final cleanup of download warnings for APP users

This has been launched since M76, so we can safely remove the feature
flag at this point.

Bug: 917190
Change-Id: I1bc9c9727d4d3ae0d0c60b99b7747c3d19b5429c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1792230
Commit-Queue: Varun Khaneja <vakh@chromium.org>
Auto-Submit: Daniel Rubery <drubery@chromium.org>
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694905}

chrome/browser/safe_browsing/advanced_protection_status_manager.cc

@@ -221,9 +221,7 @@ void AdvancedProtectionStatusManager::UpdateLastRefreshTime() {
 bool AdvancedProtectionStatusManager::RequestsAdvancedProtectionVerdicts() {
   static bool force_enabled =
       base::FeatureList::IsEnabled(kForceUseAPDownloadProtection);
-  static bool enabled = base::FeatureList::IsEnabled(kUseAPDownloadProtection);
-
-  return force_enabled || (is_under_advanced_protection() && enabled);
+  return force_enabled || is_under_advanced_protection();
 }
 
 bool AdvancedProtectionStatusManager::IsPrimaryAccount(

components/safe_browsing/features.cc

@@ -72,9 +72,6 @@ const base::Feature kTriggerThrottlerDailyQuotaFeature{
     "SafeBrowsingTriggerThrottlerDailyQuota",
     base::FEATURE_DISABLED_BY_DEFAULT};
 
-const base::Feature kUseAPDownloadProtection{"UseAPDownloadProtection",
-                                             base::FEATURE_ENABLED_BY_DEFAULT};
-
 const base::Feature kUseLocalBlacklistsV2{"SafeBrowsingUseLocalBlacklistsV2",
                                           base::FEATURE_DISABLED_BY_DEFAULT};
 
@@ -111,7 +108,6 @@ constexpr struct {
     {&kThreatDomDetailsTagAndAttributeFeature, false},
     {&kTriggerThrottlerDailyQuotaFeature, false},
     {&kUseLocalBlacklistsV2, true},
-    {&kUseAPDownloadProtection, true},
 };
 
 // Adds the name and the enabled/disabled status of a given feature.

components/safe_browsing/features.h

@@ -43,7 +43,7 @@ extern const base::Feature kCommittedSBInterstitials;
 
 // Controls whether the user has forcibly enabled AP download protection. This
 // flag will enable AP downloads protections even for users not enrolled in
-// APP. See also |kUseAPDownloadProtection|.
+// APP.
 extern const base::Feature kForceUseAPDownloadProtection;
 
 // Enable GAIA password protection for signed-in users.
@@ -81,10 +81,6 @@ extern const base::Feature kThreatDomDetailsTagAndAttributeFeature;
 // trials simultaneously.
 extern const base::Feature kTriggerThrottlerDailyQuotaFeature;
 
-// Controls whether we use AP download protection. This flag only has any effect
-// for users enrolled in APP. See also |kForceUseAPDownloadProtection|.
-extern const base::Feature kUseAPDownloadProtection;
-
 // Controls whether Chrome on Android uses locally cached blacklists.
 extern const base::Feature kUseLocalBlacklistsV2;