signin: Abort previous 'channelConnected' handling on retry

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 206 matching lines @@
       }
       this.supportChannel_.registerMessage(
           'completeLogin', this.onCompleteLogin_.bind(this));
       this.initSAML_();
       this.supportChannel_.send({name: 'resetAuth'});
       this.maybeInitialized_();
     }.bind(this));
 
     window.setTimeout(function() {
       if (!this.supportChannel_) {
+        // Give up previous channel and bind its 'channelConnected' to a no-op.
+        supportChannel.registerMessage('channelConnected', function() {});
+
         // Re-initialize the channel if it is not connected properly, e.g.
         // connect may be called before background script started running.
         this.initSupportChannel_();
       }
     }.bind(this), 200);
   },
 
   /**
    * Called when one of the initialization stages has finished. If all the
    * needed parts are initialized, notifies parent about successfull
@@ skipping 304 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();