Merge "sign-in: Allow no-SAML-password to finish if caller does not care"

> BUG=493265
>
> Review URL: https://codereview.chromium.org/1164623002
>
> Cr-Commit-Position: refs/heads/master@{#332042}
> (cherry picked from commit e6fc5540775038aa7fd22105c967eabcf4a992f1)
>
> sign-in: Fix typo in previous fix
>
> Cr-Commit-Position: refs/heads/master@{#332066}
> (cherry picked from commit 84f2eb280276dffd001d806d053ff9d9d673a00c)

TBR=xiyuan@chromium.org

Review URL: https://codereview.chromium.org/1155243006

Cr-Commit-Position: refs/branch-heads/2357@{#452}
Cr-Branched-From: 59d4494849b405682265ed5d3f5164573b9a939b-refs/heads/master@{#323860}

1 files changed, 6 insertions, 3 deletions

diff --git a/chrome/browser/resources/gaia_auth_host/authenticator.js b/chrome/browser/resources/gaia_auth_host/authenticator.js
index aad0e7f..3b9c042 100644
--- a/chrome/browser/resources/gaia_auth_host/authenticator.js
+++ b/chrome/browser/resources/gaia_auth_host/authenticator.js
@@ -449,10 +449,13 @@ cr.define('cr.login', function() {
     } else if (this.samlHandler_.scrapedPasswordCount == 0) {
       if (this.noPasswordCallback) {
         this.noPasswordCallback(this.email_);
-      } else {
-        console.error('Authenticator: No password scraped for SAML.');
+        return;
       }
-      return;
+
+      // Fall through to finish the auth flow even if this.needPassword
+      // is true. This is because the flag is used as an intention to get
+      // password when it is available but not a mandatory requirement.
+      console.warn('Authenticator: No password scraped for SAML.');
     } else if (this.needPassword) {
       if (this.confirmPasswordCallback) {
         // Confirm scraped password. The flow follows in