signin: Abort previous 'channelConnected' handling on retry

chrome/browser/resources/gaia_auth/background.js

Index: chrome/browser/resources/gaia_auth/background.js
diff --git a/chrome/browser/resources/gaia_auth/background.js b/chrome/browser/resources/gaia_auth/background.js
index 3b529f33463c21d3d85f8d7cd96b3431e777982d..48230439ab616ccdb932f0645d479eaecbf42608 100644
--- a/chrome/browser/resources/gaia_auth/background.js
+++ b/chrome/browser/resources/gaia_auth/background.js
@@ -28,14 +28,13 @@
  * the associated tab id.
  */
 function BackgroundBridgeManager() {
+  // Maps a tab id to its associated BackgroundBridge.
+  this.bridges_ = {};
 }
 
 BackgroundBridgeManager.prototype = {
   CONTINUE_URL_BASE: 'chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik' +
                      '/success.html',
-  // Maps a tab id to its associated BackgroundBridge.
-  bridges_: {},

[dzhioev (left Google), 2015/06/10 20:04:18]

Can you replace this with 'bridges_: null' instead of removing?

[xiyuan, 2015/06/10 20:21:12]

It is not deleted. It is moved to BackgroundBridgeManager constructor so that we
have a per-instance copy of it.

[dzhioev (left Google), 2015/06/10 21:20:46]

I understand this. That's a matter of opinion, but I find it handy when all
properties that are used by "class" are "declared" in the beginning of
prototype. Some of them could be initialized in a constructor. Something like
that:

function FooBar() {
  this.foo_ = new Foo();
}

FooBar.prototype = {
  /**
   * Comment about |foo_|.
   */
  foo_: null,

  /**
   * Comment about |bar_|.
  bar_: 1
};

[xiyuan, 2015/06/10 21:32:45]

I see what you mean now. Done here and other places.

-
   run: function() {
     chrome.runtime.onConnect.addListener(this.onConnect_.bind(this));
 
@@ -103,6 +102,7 @@ BackgroundBridgeManager.prototype = {
  */
 function BackgroundBridge(tabId) {
   this.tabId_ = tabId;
+  this.passwordStore_ = {};
 }
 
 BackgroundBridge.prototype = {
@@ -148,8 +148,6 @@ BackgroundBridge.prototype = {
   // Whether SAML flow is going.
   isSAML_: false,
 
-  passwordStore_: {},

[dzhioev (left Google), 2015/06/10 20:04:18]

ditto

[xiyuan, 2015/06/10 20:21:12]

Same here. It is moved to BackgroundBridge constructor.

-
   channelMain_: null,
   channelInjected_: null,