Do not clear password field in authenticator in case emails mismatch.

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.
 
 /**
  * @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
  * cr.login.GaiaAuthHost.Listener as defined in this file. After initialization,
  * call {@code load} to start the authentication flow.
@@ skipping 98 matching lines @@
     this.isConstrainedWindow_ = data.constrained == '1';
 
     this.initialFrameUrl_ = this.constructInitialFrameUrl_(data);
     this.reloadUrl_ = data.frameUrl || this.initialFrameUrl_;
     this.authFlow_ = AuthFlow.DEFAULT;
 
     this.webview_.src = this.reloadUrl_;
     this.webview_.addEventListener(
         'newwindow', this.onNewWindow_.bind(this));
     this.webview_.addEventListener(
+        'contentload', this.onContentLoad_.bind(this));
+    this.webview_.addEventListener(
         'loadstop', this.onLoadStop_.bind(this));
     this.webview_.request.onCompleted.addListener(
         this.onRequestCompleted_.bind(this),
         {urls: ['*://*/*', this.continueUrlWithoutParams_ + '*'],
             types: ['main_frame']},
         ['responseHeaders']);
     this.webview_.request.onHeadersReceived.addListener(
         this.onHeadersReceived_.bind(this),
         {urls: [this.idpOrigin_ + '*'], types: ['main_frame']},
         ['responseHeaders']);
@@ skipping 60 matching lines @@
         }
       }
       if (!isEmbeddedPage) {
         this.dispatchEvent(new CustomEvent('resize', {detail: currentUrl}));
         return;
       }
     }
 
     this.updateHistoryState_(currentUrl);
 
-    // Posts a message to IdP pages to initiate communication.
-    if (currentUrl.lastIndexOf(this.idpOrigin_) == 0)
-      this.webview_.contentWindow.postMessage({}, currentUrl);
   };
 
   /**
     * Manually updates the history. Invoked upon completion of a webview
     * navigation.
     * @param {string} url Request URL.
     * @private
     */
   Authenticator.prototype.updateHistoryState_ = function(url) {
     if (history.state && history.state.url != url)
@@ skipping 35 matching lines @@
       var header = headers[i];
       var headerName = header.name.toLowerCase();
       if (headerName == SIGN_IN_HEADER) {
         var headerValues = header.value.toLowerCase().split(',');
         var signinDetails = {};
         headerValues.forEach(function(e) {
           var pair = e.split('=');
           signinDetails[pair[0].trim()] = pair[1].trim();
         });
         // Removes "" around.
-        var email = signinDetails['email'].slice(1, -1);
-        if (this.email_ != email) {
-          this.email_ = email;
-          // Clears the scraped password if the email has changed.
-          this.password_ = null;
-        }
+        this.email_ = signinDetails['email'].slice(1, -1);
         this.gaiaId_ = signinDetails['obfuscatedid'].slice(1, -1);
         this.sessionIndex_ = signinDetails['sessionindex'];
       } else if (headerName == SAML_HEADER) {
         this.authFlow_ = AuthFlow.SAML;
       }
     }
   };
 
   /**
    * Invoked when an HTML5 message is received from the webview element.
@@ skipping 37 matching lines @@
   };
 
   /**
    * Invoked when the webview attempts to open a new window.
    * @private
    */
   Authenticator.prototype.onNewWindow_ = function(e) {
     this.dispatchEvent(new CustomEvent('newWindow', {detail: e}));
   };
 
+  Authenticator.prototype.onContentLoad_ = function(e) {
+    // Posts a message to IdP pages to initiate communication.
+    var currentUrl = this.webview_.src;
+    if (currentUrl.lastIndexOf(this.idpOrigin_) == 0) {
+      this.webview_.contentWindow.postMessage({}, currentUrl);
+    }
+  };

[xiyuan, 2015/01/30 18:19:51]

nit: insert a blank line after

[Roman Sorokin (ftl), 2015/02/02 08:55:54]

Done.

   /**
    * Invoked when the webview finishes loading a page.
    * @private
    */
   Authenticator.prototype.onLoadStop_ = function(e) {
     if (!this.loaded_) {
       this.loaded_ = true;
       this.webview_.focus();
       this.dispatchEvent(new Event('ready'));
     }
   };
 
   Authenticator.AuthFlow = AuthFlow;
   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
   };
 });