Strengthen the rules when the Credential Manager API is disabled.

components/password_manager/content/browser/credential_manager_impl.cc

Index: components/password_manager/content/browser/credential_manager_impl.cc
diff --git a/components/password_manager/content/browser/credential_manager_impl.cc b/components/password_manager/content/browser/credential_manager_impl.cc
index 66a457b8e0ddefb3a324bca2c0aabd07835b0895..aaa112d89c36149ed90e6ffcd2cbb205a4b1582e 100644
--- a/components/password_manager/content/browser/credential_manager_impl.cc
+++ b/components/password_manager/content/browser/credential_manager_impl.cc
@@ -117,7 +117,7 @@ void CredentialManagerImpl::RequireUserMediation(
         .LogRequireUserMediation(web_contents()->GetLastCommittedURL());
   }
   PasswordStore* store = GetPasswordStore();
-  if (!store || !IsUpdatingCredentialAllowed()) {
+  if (!store || !client_->IsSavingAndFillingEnabledForCurrentPage()) {
     callback.Run();
     return;
   }
@@ -178,8 +178,8 @@ void CredentialManagerImpl::Get(bool zero_click_only,
 
   // Return an empty credential if zero-click is required but disabled, or if
   // the current page has TLS errors.
-  if ((zero_click_only && !IsZeroClickAllowed()) ||
-      client_->DidLastPageLoadEncounterSSLErrors()) {
+  if (!client_->IsFillingEnabledForCurrentPage() ||
+      (zero_click_only && !IsZeroClickAllowed())) {
     // Callback with empty credential info.
     callback.Run(mojom::CredentialManagerError::SUCCESS, CredentialInfo());
     return;
@@ -262,7 +262,6 @@ void CredentialManagerImpl::SendPasswordForm(
     info = CredentialInfo(*form, type_to_return);
     if (PasswordStore* store = GetPasswordStore()) {
       if (form->skip_zero_click && IsZeroClickAllowed()) {
-        DCHECK(IsUpdatingCredentialAllowed());
         autofill::PasswordForm update_form = *form;
         update_form.skip_zero_click = false;
         store->UpdateLogin(update_form);
@@ -295,9 +294,4 @@ void CredentialManagerImpl::DoneRequiringUserMediation() {
   pending_require_user_mediation_.reset();
 }
 
-bool CredentialManagerImpl::IsUpdatingCredentialAllowed() const {
-  return !client_->DidLastPageLoadEncounterSSLErrors() &&
-         !client_->IsOffTheRecord();
-}
-
 }  // namespace password_manager