Revert 246674 "Indicate which authentication flow was used in Us..."

trunk/src/chrome/browser/resources/gaia_auth/main.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * Authenticator class wraps the communications between Gaia and its host.
  */
 function Authenticator() {
 }
 
@@ skipping 164 matching lines @@
           'newwindow', this.onWebviewNewWindow_.bind(this, gaiaFrame));
     }
     if (this.constrained_) {
       gaiaFrame.request.onCompleted.addListener(
           this.onWebviewRequestCompleted_.bind(this),
           {urls: ['<all_urls>'], types: ['main_frame']},
           ['responseHeaders']);
     }
   },
 
-  completeLogin: function() {
+  completeLogin: function(username, password) {
     var msg = {
       'method': 'completeLogin',
-      'email': this.email_,
-      'password': this.password_,
-      'usingSAML': this.isSAMLFlow_
+      'email': username,
+      'password': password
     };
     window.parent.postMessage(msg, this.parentPage_);
     if (this.samlSupportChannel_)
       this.samlSupportChannel_.send({name: 'resetAuth'});
   },
 
   onPageLoad: function(e) {
     window.addEventListener('message', this.onMessage.bind(this), false);
     this.loadFrame_();
   },
@@ skipping 70 matching lines @@
       gaiaFrame.focus();
       gaiaFrame.onblur = function() {
         gaiaFrame.focus();
       };
     }
     this.loaded_ = true;
   },
 
   onConfirmLogin_: function() {
     if (!this.isSAMLFlow_) {
-      this.completeLogin();
+      this.completeLogin(this.email_, this.password_);
       return;
     }
 
     // Retrieve the e-mail address of the user who just authenticated from GAIA.
     window.parent.postMessage({method: 'retrieveAuthenticatedUserEmail',
                                attemptToken: this.attemptToken_},
                               this.parentPage_);
 
     if (!this.password_) {
       this.samlSupportChannel_.sendWithCallback(
           {name: 'getScrapedPasswords'},
           function(passwords) {
             if (passwords.length == 0) {
               window.parent.postMessage(
                   {method: 'noPassword', email: this.email_},
                   this.parentPage_);
             } else {
               window.parent.postMessage(
                   {method: 'confirmPassword', email: this.email_},
                   this.parentPage_);
             }
           }.bind(this));
     }
   },
 
   maybeCompleteSAMLLogin_: function() {
     // SAML login is complete when the user's e-mail address has been retrieved
     // from GAIA and the user has successfully confirmed the password.
     if (this.email_ !== null && this.password_ !== null)
-      this.completeLogin();
+      this.completeLogin(this.email_, this.password_);
   },
 
   onVerifyConfirmedPassword_: function(password) {
     this.samlSupportChannel_.sendWithCallback(
         {name: 'getScrapedPasswords'},
         function(passwords) {
           for (var i = 0; i < passwords.length; ++i) {
             if (passwords[i] == password) {
               this.password_ = passwords[i];
               this.maybeCompleteSAMLLogin_();
@@ skipping 43 matching lines @@
     } else if (msg.method == 'redirectToSignin' &&
                this.isParentMessage_(e)) {
       $('gaia-frame').src = this.constructInitialFrameUrl_();
     } else {
        console.error('Authenticator.onMessage: unknown message + origin!?');
     }
   }
 };
 
 Authenticator.getInstance().initialize();