Disable by default all Password Protection experiments.

The reason for this is due to changes in the Finch
files which means that Finch may not be able to
connect to a user which would cause the changes
to not take into effect.

Bug: 1068525
Change-Id: Ib8e318d4b2cd3f0c2fb863ee94ce11a594295be0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2197518
Commit-Queue: Bettina Dea <bdea@chromium.org>
Reviewed-by: Xinghui Lu <xinghuilu@chromium.org>
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772023}

chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc

@@ -426,15 +426,13 @@ TEST_F(ChromePasswordProtectionServiceTest,
 TEST_F(ChromePasswordProtectionServiceTest,
        VerifyUserPopulationForSavedPasswordEntryPing) {
   base::test::ScopedFeatureList feature_list;
-  feature_list.InitAndDisableFeature(
-      safe_browsing::kPasswordProtectionForSignedInUsers);
 
   ReusedPasswordAccountType reused_password_type;
   reused_password_type.set_account_type(
       ReusedPasswordAccountType::SAVED_PASSWORD);
 
   service_->ConfigService(false /*incognito*/, false /*SBER*/);
-  EXPECT_TRUE(service_->IsPingingEnabled(
+  EXPECT_FALSE(service_->IsPingingEnabled(
       LoginReputationClientRequest::PASSWORD_REUSE_EVENT,
       reused_password_type));
 
@@ -444,7 +442,7 @@ TEST_F(ChromePasswordProtectionServiceTest,
       reused_password_type));
 
   service_->ConfigService(true /*incognito*/, false /*SBER*/);
-  EXPECT_TRUE(service_->IsPingingEnabled(
+  EXPECT_FALSE(service_->IsPingingEnabled(
       LoginReputationClientRequest::PASSWORD_REUSE_EVENT,
       reused_password_type));
 

components/safe_browsing/content/password_protection/password_protection_service.cc

@@ -542,7 +542,8 @@ bool PasswordProtectionService::IsSupportedPasswordTypeForPinging(
     PasswordType password_type) const {
   switch (password_type) {
     case PasswordType::SAVED_PASSWORD:
-      return true;
+      return base::FeatureList::IsEnabled(
+          safe_browsing::kPasswordProtectionForSavedPasswords);
     case PasswordType::PRIMARY_ACCOUNT_PASSWORD:
       return true;
     case PasswordType::ENTERPRISE_PASSWORD:

components/safe_browsing/content/password_protection/password_protection_service_unittest.cc

@@ -1166,9 +1166,13 @@ TEST_P(PasswordProtectionServiceTest, VerifyShouldShowModalWarning) {
 
   reused_password_account_type.set_account_type(
       ReusedPasswordAccountType::SAVED_PASSWORD);
-  EXPECT_TRUE(password_protection_service_->ShouldShowModalWarning(
+  EXPECT_FALSE(password_protection_service_->ShouldShowModalWarning(
       LoginReputationClientRequest::PASSWORD_REUSE_EVENT,
-      reused_password_account_type, LoginReputationClientResponse::PHISHING));
+      reused_password_account_type,
+      LoginReputationClientResponse::LOW_REPUTATION));
+  base::test::ScopedFeatureList feature_list;
+  feature_list.InitAndEnableFeature(
+      safe_browsing::kPasswordProtectionForSavedPasswords);
   EXPECT_TRUE(password_protection_service_->ShouldShowModalWarning(
       LoginReputationClientRequest::PASSWORD_REUSE_EVENT,
       reused_password_account_type,
@@ -1329,39 +1333,27 @@ TEST_P(PasswordProtectionServiceTest, VerifyIsSupportedPasswordTypeForPinging) {
   EXPECT_CALL(*password_protection_service_, GetSignedInNonSyncAccount(_))
       .WillRepeatedly(Return(account_info));
 
-  EXPECT_TRUE(password_protection_service_->IsSupportedPasswordTypeForPinging(
-      PasswordType::SAVED_PASSWORD));
   EXPECT_TRUE(password_protection_service_->IsSupportedPasswordTypeForPinging(
       PasswordType::PRIMARY_ACCOUNT_PASSWORD));
-// kPasswordProtectionForSignedInUsers is disabled by default on Android.
-#if defined(OS_ANDROID)
   EXPECT_FALSE(password_protection_service_->IsSupportedPasswordTypeForPinging(
-#else
-  EXPECT_TRUE(password_protection_service_->IsSupportedPasswordTypeForPinging(
-#endif
       PasswordType::OTHER_GAIA_PASSWORD));
   EXPECT_TRUE(password_protection_service_->IsSupportedPasswordTypeForPinging(
       PasswordType::ENTERPRISE_PASSWORD));
-
-  EXPECT_TRUE(password_protection_service_->IsSupportedPasswordTypeForPinging(
+  EXPECT_FALSE(password_protection_service_->IsSupportedPasswordTypeForPinging(
       PasswordType::SAVED_PASSWORD));
-  EXPECT_TRUE(password_protection_service_->IsSupportedPasswordTypeForPinging(
-      PasswordType::ENTERPRISE_PASSWORD));
   {
     base::test::ScopedFeatureList feature_list;
-    feature_list.InitAndDisableFeature(
+    feature_list.InitAndEnableFeature(
         safe_browsing::kPasswordProtectionForSignedInUsers);
-    // Only ping for signed in, non-syncing users if the experiment is on.
-    EXPECT_FALSE(
-        password_protection_service_->IsSupportedPasswordTypeForPinging(
-            PasswordType::OTHER_GAIA_PASSWORD));
+    EXPECT_TRUE(password_protection_service_->IsSupportedPasswordTypeForPinging(
+        PasswordType::OTHER_GAIA_PASSWORD));
   }
   {
     base::test::ScopedFeatureList feature_list;
     feature_list.InitAndEnableFeature(
-        safe_browsing::kPasswordProtectionForSignedInUsers);
+        safe_browsing::kPasswordProtectionForSavedPasswords);
     EXPECT_TRUE(password_protection_service_->IsSupportedPasswordTypeForPinging(
-        PasswordType::OTHER_GAIA_PASSWORD));
+        PasswordType::SAVED_PASSWORD));
   }
 }
 

components/safe_browsing/core/features.cc

@@ -49,21 +49,15 @@ const base::Feature kMalwareScanEnabled{"SafeBrowsingMalwareScanEnabled",
 
 const base::Feature kPasswordProtectionForSavedPasswords{
     "SafeBrowsingPasswordProtectionForSavedPasswords",
-    base::FEATURE_ENABLED_BY_DEFAULT};
+    base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::Feature kPasswordProtectionShowDomainsForSavedPasswords{
     "SafeBrowsingPasswordProtectionShowDomainsForSavedPasswords",
-    base::FEATURE_ENABLED_BY_DEFAULT};
+    base::FEATURE_DISABLED_BY_DEFAULT};
 
-#if BUILDFLAG(FULL_SAFE_BROWSING)
-const base::Feature kPasswordProtectionForSignedInUsers{
-    "SafeBrowsingPasswordProtectionForSignedInUsers",
-    base::FEATURE_ENABLED_BY_DEFAULT};
-#else
 const base::Feature kPasswordProtectionForSignedInUsers{
     "SafeBrowsingPasswordProtectionForSignedInUsers",
     base::FEATURE_DISABLED_BY_DEFAULT};
-#endif
 
 const base::Feature kPromptAppForDeepScanning{
     "SafeBrowsingPromptAppForDeepScanning", base::FEATURE_DISABLED_BY_DEFAULT};