Enable enhanced protection on Android by default.

Bug: 1097310
Change-Id: Icac2b18a2a289bef1315e60bff51d77f14d40a85
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2568585
Commit-Queue: Xinghui Lu <xinghuilu@chromium.org>
Commit-Queue: Varun Khaneja <vakh@chromium.org>
Auto-Submit: Xinghui Lu <xinghuilu@chromium.org>
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833056}

chrome/common/chrome_features.cc

@@ -705,7 +705,7 @@ const base::Feature kPrivacyAdvisor{"PrivacyAdvisor",
 
 #if defined(OS_ANDROID)
 const base::Feature kPrivacyReorderedAndroid{"PrivacyReorderedAndroid",
-                                             base::FEATURE_DISABLED_BY_DEFAULT};
+                                             base::FEATURE_ENABLED_BY_DEFAULT};
 #endif
 
 // Enables the privacy sandbox settings page.

components/safe_browsing/core/features.cc

@@ -55,14 +55,8 @@ const base::Feature kSimplifiedUrlDisplay{"SimplifiedUrlDisplay",
 const base::Feature kDownloadRequestWithToken{
     "SafeBrowsingDownloadRequestWithToken", base::FEATURE_ENABLED_BY_DEFAULT};
 
-const base::Feature kEnhancedProtection {
-  "SafeBrowsingEnhancedProtection",
-#if BUILDFLAG(FULL_SAFE_BROWSING)
-      base::FEATURE_ENABLED_BY_DEFAULT
-#else
-      base::FEATURE_DISABLED_BY_DEFAULT
-#endif
-};
+const base::Feature kEnhancedProtection{"SafeBrowsingEnhancedProtection",
+                                        base::FEATURE_ENABLED_BY_DEFAULT};
 
 const base::Feature kEnhancedProtectionMessageInInterstitials{
     "SafeBrowsingEnhancedProtectionMessageInInterstitials",
@@ -129,7 +123,7 @@ constexpr base::FeatureParam<bool> kShouldFillOldPhishGuardProto{
     &kPasswordProtectionForSignedInUsers, "DeprecateOldProto", false};
 
 const base::Feature kSafeBrowsingSectionUIAndroid{
-    "SafeBrowsingSecuritySectionUIAndroid", base::FEATURE_DISABLED_BY_DEFAULT};
+    "SafeBrowsingSecuritySectionUIAndroid", base::FEATURE_ENABLED_BY_DEFAULT};
 
 const base::Feature kSuspiciousSiteTriggerQuotaFeature{
     "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_ENABLED_BY_DEFAULT};