Fully launch the compromised password bubble on ToT and delete the flag.

Bug: 1049200
Change-Id: Ia6a88ff8613096645c11a6b45b8bca2148a67adb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518860
Commit-Queue: Vasilii Sukhanov <vasilii@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824362}

chrome/browser/ui/passwords/manage_passwords_test.cc

@@ -124,8 +124,6 @@ void ManagePasswordsTest::SetupAutoSignin(
 }
 
 void ManagePasswordsTest::SetupSafeState() {
-  DCHECK(base::FeatureList::IsEnabled(
-      password_manager::features::kCompromisedPasswordsReengagement));
   browser()->profile()->GetPrefs()->SetDouble(
       password_manager::prefs::kLastTimePasswordCheckCompleted,
       (base::Time::Now() - base::TimeDelta::FromMinutes(1)).ToDoubleT());
@@ -140,8 +138,6 @@ void ManagePasswordsTest::SetupSafeState() {
 }
 
 void ManagePasswordsTest::SetupMoreToFixState() {
-  DCHECK(base::FeatureList::IsEnabled(
-      password_manager::features::kCompromisedPasswordsReengagement));
   scoped_refptr<password_manager::PasswordStore> password_store =
       PasswordStoreFactory::GetForProfile(browser()->profile(),
                                           ServiceAccessType::IMPLICIT_ACCESS);
@@ -162,8 +158,6 @@ void ManagePasswordsTest::SetupMoreToFixState() {
 }
 
 void ManagePasswordsTest::SetupUnsafeState() {
-  DCHECK(base::FeatureList::IsEnabled(
-      password_manager::features::kCompromisedPasswordsReengagement));
   scoped_refptr<password_manager::PasswordStore> password_store =
       PasswordStoreFactory::GetForProfile(browser()->profile(),
                                           ServiceAccessType::IMPLICIT_ACCESS);

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

@@ -521,21 +521,19 @@ void ManagePasswordsUIController::SavePassword(const base::string16& username,
     }
   }
 
-  if (base::FeatureList::IsEnabled(
-          password_manager::features::kCompromisedPasswordsReengagement)) {
-    post_save_compromised_helper_ =
-        std::make_unique<password_manager::PostSaveCompromisedHelper>(
-            passwords_data_.form_manager()->GetCompromisedCredentials(),
-            username);
-    post_save_compromised_helper_->AnalyzeLeakedCredentials(
-        passwords_data_.client()->GetProfilePasswordStore(),
-        passwords_data_.client()->GetAccountPasswordStore(),
-        Profile::FromBrowserContext(web_contents()->GetBrowserContext())
-            ->GetPrefs(),
-        base::Bind(
-            &ManagePasswordsUIController::OnTriggerPostSaveCompromisedBubble,
-            weak_ptr_factory_.GetWeakPtr()));
-  }
+  post_save_compromised_helper_ =
+      std::make_unique<password_manager::PostSaveCompromisedHelper>(
+          passwords_data_.form_manager()->GetCompromisedCredentials(),
+          username);
+  post_save_compromised_helper_->AnalyzeLeakedCredentials(
+      passwords_data_.client()->GetProfilePasswordStore(),
+      passwords_data_.client()->GetAccountPasswordStore(),
+      Profile::FromBrowserContext(web_contents()->GetBrowserContext())
+          ->GetPrefs(),
+      base::Bind(
+          &ManagePasswordsUIController::OnTriggerPostSaveCompromisedBubble,
+          weak_ptr_factory_.GetWeakPtr()));
+
   passwords_data_.TransitionToState(password_manager::ui::MANAGE_STATE);
   // The icon is to be updated after the bubble (either "Save password" or "Sign
   // in to Chrome") is closed.

chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc

@@ -1489,9 +1489,6 @@ TEST_F(ManagePasswordsUIControllerTest, OpenBubbleForMovableForm) {
 }
 
 TEST_F(ManagePasswordsUIControllerTest, OpenSafeStateBubble) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndEnableFeature(
-      password_manager::features::kCompromisedPasswordsReengagement);
   profile()->GetPrefs()->SetDouble(
       password_manager::prefs::kLastTimePasswordCheckCompleted,
       (base::Time::Now() - base::TimeDelta::FromMinutes(1)).ToDoubleT());
@@ -1529,9 +1526,6 @@ TEST_F(ManagePasswordsUIControllerTest, OpenSafeStateBubble) {
 }
 
 TEST_F(ManagePasswordsUIControllerTest, OpenMoreToFixBubble) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndEnableFeature(
-      password_manager::features::kCompromisedPasswordsReengagement);
   submitted_form() = test_local_form();
   submitted_form().password_value = base::ASCIIToUTF16("new_password");
 
@@ -1566,10 +1560,6 @@ TEST_F(ManagePasswordsUIControllerTest, OpenMoreToFixBubble) {
 }
 
 TEST_F(ManagePasswordsUIControllerTest, OpenUnsafeStateBubble) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndEnableFeature(
-      password_manager::features::kCompromisedPasswordsReengagement);
-
   std::vector<const PasswordForm*> best_matches = {&test_local_form()};
   auto test_form_manager = CreateFormManagerWithBestMatches(&best_matches);
   MockPasswordFormManagerForUI* test_form_manager_raw = test_form_manager.get();
@@ -1600,10 +1590,6 @@ TEST_F(ManagePasswordsUIControllerTest, OpenUnsafeStateBubble) {
 }
 
 TEST_F(ManagePasswordsUIControllerTest, NoUnsafeStateBubbleIfPromoStillOpen) {
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndEnableFeature(
-      password_manager::features::kCompromisedPasswordsReengagement);
-
   std::vector<const PasswordForm*> best_matches = {&test_local_form()};
   auto test_form_manager = CreateFormManagerWithBestMatches(&best_matches);
   MockPasswordFormManagerForUI* test_form_manager_raw = test_form_manager.get();

chrome/browser/ui/views/passwords/password_bubble_browsertest.cc

@@ -27,20 +27,8 @@ class PasswordBubbleBrowserTest
       public testing::WithParamInterface<bool> {
  public:
   PasswordBubbleBrowserTest() {
-    if (GetParam()) {
-      // |kEnablePasswordsAccountStorage|, |kCompromisedPasswordsReengagement|
-      // are both enabled.
-      scoped_feature_list_.InitWithFeatures(
-          {password_manager::features::kEnablePasswordsAccountStorage,
-           password_manager::features::kCompromisedPasswordsReengagement},
-          {});
-    } else {
-      // |kCompromisedPasswordsReengagement| enabled,
-      // |kEnablePasswordsAccountStorage| disabled.
-      scoped_feature_list_.InitWithFeatures(
-          {password_manager::features::kCompromisedPasswordsReengagement},
-          {password_manager::features::kEnablePasswordsAccountStorage});
-    }
+    scoped_feature_list_.InitWithFeatureState(
+        password_manager::features::kEnablePasswordsAccountStorage, GetParam());
   }
 
   ~PasswordBubbleBrowserTest() override = default;

chrome/browser/ui/views/passwords/password_bubble_view_base.cc

@@ -104,8 +104,6 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::CreateBubble(
                  password_manager::ui::PASSWORD_UPDATED_MORE_TO_FIX ||
              model_state ==
                  password_manager::ui::PASSWORD_UPDATED_UNSAFE_STATE) {
-    DCHECK(base::FeatureList::IsEnabled(
-        password_manager::features::kCompromisedPasswordsReengagement));
     view = new PostSaveCompromisedBubbleView(web_contents, anchor_view);
   } else {
     NOTREACHED();

components/password_manager/core/common/password_manager_features.cc

@@ -21,11 +21,6 @@ const base::Feature kBiometricTouchToFill = {"BiometricTouchToFill",
 const base::Feature kChangePasswordAffiliationInfo = {
     "ChangePasswordAffiliationInfo", base::FEATURE_DISABLED_BY_DEFAULT};
 
-// After saving/updating a password show a bubble reminder about the status of
-// other compromised credentials.
-const base::Feature kCompromisedPasswordsReengagement = {
-    "CompromisedPasswordsReengagement", base::FEATURE_DISABLED_BY_DEFAULT};
-
 // Enables the editing of passwords in Chrome settings.
 const base::Feature kEditPasswordsInSettings = {
     "EditPasswordsInSettings", base::FEATURE_DISABLED_BY_DEFAULT};

components/password_manager/core/common/password_manager_features.h

@@ -19,7 +19,6 @@ namespace features {
 
 extern const base::Feature kBiometricTouchToFill;
 extern const base::Feature kChangePasswordAffiliationInfo;
-extern const base::Feature kCompromisedPasswordsReengagement;
 extern const base::Feature kEditPasswordsInSettings;
 extern const base::Feature kEnableOverwritingPlaceholderUsernames;
 extern const base::Feature kEnablePasswordsAccountStorage;

testing/variations/fieldtrial_testing_config.json

@@ -5222,24 +5222,6 @@
             ]
         }
     ],
-    "PasswordCompromisedBubble": [
-        {
-            "platforms": [
-                "chromeos",
-                "linux",
-                "mac",
-                "windows"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "enable_features": [
-                        "CompromisedPasswordsReengagement"
-                    ]
-                }
-            ]
-        }
-    ],
     "PasswordEditingInSettings": [
         {
             "platforms": [