Revert of Clear the login webview when SAML flow is canceled

chrome/browser/resources/gaia_auth_host/authenticator.js

 // Copyright 2014 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.
 
 <include src="saml_handler.js">
 
 /**
  * @fileoverview An UI component to authenciate to Chrome. The component hosts
  * IdP web pages in a webview. A client who is interested in monitoring
  * authentication events should pass a listener object of type
@@ skipping 14 matching lines @@
   var SIGN_IN_HEADER = 'google-accounts-signin';
   var EMBEDDED_FORM_HEADER = 'google-accounts-embedded';
   var LOCATION_HEADER = 'location';
   var COOKIE_HEADER = 'cookie';
   var SET_COOKIE_HEADER = 'set-cookie';
   var OAUTH_CODE_COOKIE = 'oauth_code';
   var GAPS_COOKIE = 'GAPS';
   var SERVICE_ID = 'chromeoslogin';
   var EMBEDDED_SETUP_CHROMEOS_ENDPOINT = 'embedded/setup/chromeos';
   var SAML_REDIRECTION_PATH = 'samlredirect';
-  var BLANK_PAGE_URL = 'about:blank';
 
   /**
    * The source URL parameter for the constrained signin flow.
    */
   var CONSTRAINED_FLOW_SOURCE = 'chrome';
 
   /**
    * Enum for the authorization mode, must match AuthMode defined in
    * chrome/browser/ui/webui/inline_login_ui.cc.
    * @enum {number}
@@ skipping 144 matching lines @@
     window.addEventListener(
         'popstate', this.onPopState_.bind(this), false);
   }
 
   Authenticator.prototype = Object.create(cr.EventTarget.prototype);
 
   /**
    * Reinitializes authentication parameters so that a failed login attempt
    * would not result in an infinite loop.
    */
-  Authenticator.prototype.resetStates = function() {
+  Authenticator.prototype.resetStates_ = function() {
     this.isLoaded_ = false;
     this.email_ = null;
     this.gaiaId_ = null;
     this.password_ = null;
     this.oauthCode_ = null;
     this.gapsCookie_ = null;
     this.gapsCookieSent_ = false;
     this.newGapsCookie_ = null;
     this.readyFired_ = false;
     this.chooseWhatToSync_ = false;
     this.skipForNow_ = false;
     this.sessionIndex_ = null;
     this.trusted_ = true;
     this.authFlow = AuthFlow.DEFAULT;
     this.samlHandler_.reset();
     this.videoEnabled = false;
   };
 
   /**
-   * Resets the webview to the blank page.
-   */
-  Authenticator.prototype.resetWebview = function() {
-    this.webview_.src = BLANK_PAGE_URL;
-  };
-
-  /**
    * Loads the authenticator component with the given parameters.
    * @param {AuthMode} authMode Authorization mode.
    * @param {Object} data Parameters for the authorization flow.
    */
   Authenticator.prototype.load = function(authMode, data) {
     this.authMode = authMode;
-    this.resetStates();
+    this.resetStates_();
     // gaiaUrl parameter is used for testing. Once defined, it is never changed.
     this.idpOrigin_ = data.gaiaUrl || IDP_ORIGIN;
     this.continueUrl_ = data.continueUrl || CONTINUE_URL;
     this.continueUrlWithoutParams_ =
         this.continueUrl_.substring(0, this.continueUrl_.indexOf('?')) ||
         this.continueUrl_;
     this.isConstrainedWindow_ = data.constrained == '1';
     this.isNewGaiaFlow = data.isNewGaiaFlow;
     this.useEafe_ = data.useEafe || false;
     this.clientId_ = data.clientId;
@@ skipping 27 matching lines @@
     }
 
     this.webview_.src = this.reloadUrl_;
     this.isLoaded_ = true;
   };
 
   /**
    * Reloads the authenticator component.
    */
   Authenticator.prototype.reload = function() {
-    this.resetStates();
+    this.resetStates_();
     this.webview_.src = this.reloadUrl_;
     this.isLoaded_ = true;
   };
 
   Authenticator.prototype.constructInitialFrameUrl_ = function(data) {
     if (data.doSamlRedirect) {
       var url = this.idpOrigin_ + SAML_REDIRECTION_PATH;
       url = appendParam(url, 'domain', data.enterpriseDomain);
       url = appendParam(url, 'continue', data.gaiaUrl +
           'o/oauth2/programmatic_auth?hl=' + data.hl +
@@ skipping 412 matching lines @@
             password: this.password_ || '',
             authCode: this.oauthCode_,
             usingSAML: this.authFlow == AuthFlow.SAML,
             chooseWhatToSync: this.chooseWhatToSync_,
             skipForNow: this.skipForNow_,
             sessionIndex: this.sessionIndex_ || '',
             trusted: this.trusted_,
             gapsCookie: this.newGapsCookie_ || this.gapsCookie_ || '',
           }
         }));
-    this.resetStates();
+    this.resetStates_();
   };
 
   /**
    * Invoked when |samlHandler_| fires 'insecureContentBlocked' event.
    * @private
    */
   Authenticator.prototype.onInsecureContentBlocked_ = function(e) {
     if (!this.isLoaded_)
       return;
 
@@ skipping 62 matching lines @@
     if (currentUrl.lastIndexOf(this.idpOrigin_) == 0) {
       var msg = {
         'method': 'handshake',
       };
 
       this.webview_.contentWindow.postMessage(msg, currentUrl);
 
       this.fireReadyEvent_();
       // Focus webview after dispatching event when webview is already visible.
       this.webview_.focus();
-    } else if (currentUrl == BLANK_PAGE_URL) {
-      this.fireReadyEvent_();
     }
   };
 
   /**
    * Invoked when the webview fails loading a page.
    * @private
    */
   Authenticator.prototype.onLoadAbort_ = function(e) {
     this.dispatchEvent(new CustomEvent('loadAbort',
         {detail: {error: e.reason,
@@ skipping 64 matching lines @@
   Authenticator.AuthMode = AuthMode;
   Authenticator.SUPPORTED_PARAMS = SUPPORTED_PARAMS;
 
   return {
     // TODO(guohui, xiyuan): Rename GaiaAuthHost to Authenticator once the old
     // iframe-based flow is deprecated.
     GaiaAuthHost: Authenticator,
     Authenticator: Authenticator
   };
 });