[ReEPwdSave]Don't show toggle to re-enable saving if the password manager is disabled

If the saving of passwords is generally disabled from settings, or if
the save passwords prompt can't be shown, the toggle should not be
shown either.

Bug: 1044930
Change-Id: I017ed562cfc1dc10eddf31306d0e7730cd5206a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2149332
Commit-Queue: Ioana Pandele <ioanap@chromium.org>
Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760536}

chrome/browser/password_manager/chrome_password_manager_client.cc

@@ -236,7 +236,7 @@ ChromePasswordManagerClient::ChromePasswordManagerClient(
           &ContentPasswordManagerDriverFactory::RequestSendLoggingAvailability,
           base::Unretained(driver_factory_)));
 
-  saving_and_filling_passwords_enabled_.Init(
+  saving_passwords_enabled_.Init(
       password_manager::prefs::kCredentialsEnableService, GetPrefs());
   static base::NoDestructor<password_manager::StoreMetricsReporter> reporter(
       this, GetSyncService(profile_), GetIdentityManager(), GetPrefs());
@@ -282,10 +282,7 @@ bool ChromePasswordManagerClient::IsSavingAndFillingEnabled(
     // page, and there is no API to access (or dismiss) UI bubbles/infobars.
     return false;
   }
-  // TODO(melandory): remove saving_and_filling_passwords_enabled_ check from
-  // here once we decide to switch to new settings behavior for everyone.
-  return *saving_and_filling_passwords_enabled_ && !IsIncognito() &&
-         IsFillingEnabled(url);
+  return *saving_passwords_enabled_ && !IsIncognito() && IsFillingEnabled(url);
 }
 
 bool ChromePasswordManagerClient::IsFillingEnabled(const GURL& url) const {

chrome/browser/password_manager/chrome_password_manager_client.h

@@ -369,8 +369,9 @@ class ChromePasswordManagerClient
   base::WeakPtr<PasswordGenerationPopupControllerImpl> popup_controller_;
 
   // Set to false to disable password saving (will no longer ask if you
-  // want to save passwords and also won't fill the passwords).
-  BooleanPrefMember saving_and_filling_passwords_enabled_;
+  // want to save passwords). There is no pref for disabling filling at this
+  // point.
+  BooleanPrefMember saving_passwords_enabled_;
 
   const password_manager::SyncCredentialsFilter credentials_filter_;
 

chrome/browser/password_manager/password_accessory_controller_impl.cc

@@ -284,7 +284,7 @@ void PasswordAccessoryControllerImpl::RefreshSuggestionsForField(
   if (base::FeatureList::IsEnabled(
           password_manager::features::kRecoverFromNeverSaveAndroid) &&
       is_password_field &&
-      !web_contents_->GetBrowserContext()->IsOffTheRecord()) {
+      password_client_->IsSavingAndFillingEnabled(origin.GetURL())) {
     BlacklistedStatus blacklisted_status =
         credential_cache_->GetCredentialStore(origin).GetBlacklistedStatus();
     if (blacklisted_status == BlacklistedStatus::kWasBlacklisted ||

chrome/browser/password_manager/password_accessory_controller_impl_unittest.cc

@@ -40,6 +40,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "url/gurl.h"
 #include "url/origin.h"
 
 namespace {
@@ -106,6 +107,8 @@ class MockPasswordManagerClient
               UpdateCacheWithBlacklistedForOrigin,
               (const url::Origin&, bool));
 
+  MOCK_METHOD(bool, IsSavingAndFillingEnabled, (const GURL&), (const));
+
   password_manager::PasswordStore* GetProfilePasswordStore() const override {
     return mock_password_store_;
   }
@@ -604,6 +607,8 @@ TEST_F(PasswordAccessoryControllerTest, AddsSaveToggleIfIsBlacklisted) {
   cache()->SaveCredentialsAndBlacklistedForOrigin(
       {}, CredentialCache::IsOriginBlacklisted(true),
       url::Origin::Create(GURL(kExampleSite)));
+  ON_CALL(*password_client(), IsSavingAndFillingEnabled(GURL(kExampleSite)))
+      .WillByDefault(Return(true));
   AccessorySheetData::Builder data_builder(AccessoryTabType::PASSWORDS,
                                            passwords_empty_str(kExampleDomain));
   data_builder
@@ -620,39 +625,27 @@ TEST_F(PasswordAccessoryControllerTest, AddsSaveToggleIfIsBlacklisted) {
 }
 
 TEST_F(PasswordAccessoryControllerTest,
-       NoSaveToggleIfIsBlacklistedAndIncognito) {
+       NoSaveToggleIfIsBlacklistedAndSavingDisabled) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitAndEnableFeature(
       password_manager::features::kRecoverFromNeverSaveAndroid);
 
-  auto incognito_web_contents(content::WebContentsTester::CreateTestWebContents(
-      profile()->GetOffTheRecordProfile(), /*site_instance=*/nullptr));
-  content::WebContents* raw_web_contents = incognito_web_contents.get();
-
-  // Set the correct WebContents for the test and make sure the right frame
-  // is focused.
-  SetContents(std::move(incognito_web_contents));
-  NavigateAndCommit(GURL(kExampleSite));
-  FocusWebContentsOnMainFrame();
-
-  PasswordAccessoryControllerImpl::CreateForWebContentsForTesting(
-      raw_web_contents, cache(), mock_manual_filling_controller_.AsWeakPtr(),
-      password_client());
-  PasswordAccessoryController* incognito_accessory =
-      PasswordAccessoryControllerImpl::FromWebContents(raw_web_contents);
+  // Simulate saving being disabled (e.g. being in incognito or having password
+  // saving disabled from settings).
+  ON_CALL(*password_client(), IsSavingAndFillingEnabled(GURL(kExampleSite)))
+      .WillByDefault(Return(false));
+
   cache()->SaveCredentialsAndBlacklistedForOrigin(
       {}, CredentialCache::IsOriginBlacklisted(true),
       url::Origin::Create(GURL(kExampleSite)));
 
-  // Check that the accessory data passed to the |ManualFillingController| does
-  // not contain the save passwords toggle.
   AccessorySheetData::Builder data_builder(AccessoryTabType::PASSWORDS,
                                            passwords_empty_str(kExampleDomain));
   data_builder.AppendFooterCommand(manage_passwords_str(),
                                    autofill::AccessoryAction::MANAGE_PASSWORDS);
   EXPECT_CALL(mock_manual_filling_controller_,
               RefreshSuggestions(std::move(data_builder).Build()));
-  incognito_accessory->RefreshSuggestionsForField(
+  controller()->RefreshSuggestionsForField(
       FocusedFieldType::kFillablePasswordField,
       /*is_manual_generation_available=*/false);
 }
@@ -668,6 +661,8 @@ TEST_F(PasswordAccessoryControllerTest, AddsSaveToggleIfWasBlacklisted) {
   cache()->UpdateBlacklistedForOrigin(
       url::Origin::Create(GURL(kExampleSite)),
       CredentialCache::IsOriginBlacklisted(false));
+  ON_CALL(*password_client(), IsSavingAndFillingEnabled(GURL(kExampleSite)))
+      .WillByDefault(Return(true));
   AccessorySheetData::Builder data_builder(AccessoryTabType::PASSWORDS,
                                            passwords_empty_str(kExampleDomain));
   data_builder

components/password_manager/core/browser/password_manager_client.h

@@ -101,6 +101,8 @@ class PasswordManagerClient {
   // the presence of SSL errors on a page. |url| describes the URL to fill the
   // password for. It is not necessary the URL of the current page but can be a
   // URL of a proxy or subframe.
+  // TODO(crbug.com/1071842): This method's name is misleading as it also
+  // determines whether saving prompts should be shown.
   virtual bool IsFillingEnabled(const GURL& url) const;
 
   // Checks if manual filling fallback is enabled for the page that has |url|