[Password Manager] Minor cleanups

Bug: 725883
Change-Id: I37a70c83dc47011995e24ac972cc81a3c8a7377a
Reviewed-on: https://chromium-review.googlesource.com/620487
Commit-Queue: Maxim Kolosovskiy <kolos@chromium.org>
Reviewed-by: Maxim Kolosovskiy <kolos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#495627}

chrome/browser/password_manager/password_manager_test_base.h

@@ -65,12 +65,12 @@ class BubbleObserver {
  public:
   explicit BubbleObserver(content::WebContents* web_contents);
 
-  // Checks if the save prompt is being currently available due to both manual
+  // Checks if the save prompt is being currently available due to either manual
   // fallback or successful login.
   bool IsSavePromptAvailable() const;
 
-  // Checks if the update prompt is being currently available due to both manual
-  // fallback or successful login.
+  // Checks if the update prompt is being currently available due to either
+  // manual fallback or successful login.
   bool IsUpdatePromptAvailable() const;
 
   // Checks if the save prompt was shown automatically.

components/autofill/content/renderer/password_autofill_agent.cc

@@ -1807,14 +1807,14 @@ void PasswordAutofillAgent::ProvisionallySavePassword(
     ProvisionallySaveRestriction restriction) {
   if (!password_form)
     return;
-  bool has_no_password = password_form->password_value.empty() &&
-                         password_form->new_password_value.empty();
-  if (restriction == RESTRICTION_NON_EMPTY_PASSWORD && has_no_password)
+  bool has_password = !password_form->password_value.empty() ||
+                      !password_form->new_password_value.empty();
+  if (restriction == RESTRICTION_NON_EMPTY_PASSWORD && !has_password)
     return;
 
   DCHECK(password_form && (!form.IsNull() || !input.IsNull()));
   provisionally_saved_form_.Set(std::move(password_form), form, input);
-  if (!has_no_password) {
+  if (has_password) {
     GetPasswordManagerDriver()->ShowManualFallbackForSaving(
         provisionally_saved_form_.password_form());
   } else {