Delete and recreate the client plugin if WCS is reloaded.

remoting/webapp/session_connector.js

 // Copyright 2013 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
  * Connect set-up state machine for Me2Me and IT2Me
  */
 
 'use strict';
@@ skipping 299 matching lines @@
 };
 
 /**
  * Load the WCS driver script.
  *
  * @param {string} token An OAuth2 access token.
  * @return {void} Nothing.
  * @private
  */
 remoting.SessionConnector.prototype.loadWcs_ = function(token) {
   remoting.wcsSandbox.setOnReady(this.onWcsLoaded_.bind(this));

[Sergey Ulanov, 2013/06/20 02:41:53]

I think it's better to rename setOnReady() to make it clear that the callback
may be called more than once (e.g. setOnLocalJid()).

[Jamie, 2013/06/20 17:32:20]

Done.

   remoting.wcsSandbox.setOnError(this.onError_);
   remoting.wcsSandbox.setAccessToken(token);
   this.startAccessTokenRefreshTimer_();
 };
 
 /**
  * Continue an IT2Me or Me2Me connection once WCS has been loaded.
  *
  * @param {string} clientJid The full JID of the WCS client.
  * @return {void} Nothing.
  * @private
  */
 remoting.SessionConnector.prototype.onWcsLoaded_ = function(clientJid) {
   this.clientJid_ = clientJid;
   this.createSessionIfReady_();
 };
 
 /**
  * If both the client and host JIDs are available, create a session and connect.
  *
  * @return {void} Nothing.
  * @private
  */
 remoting.SessionConnector.prototype.createSessionIfReady_ = function() {
   if (!this.clientJid_ || !this.hostJid_) {
     return;
   }
 
+  // In some circumstances, the WCS <iframe> can get reloaded, which results

[Sergey Ulanov, 2013/06/20 02:41:53]

Would it be better to put this code in onWcsLoaded_()?

[Jamie, 2013/06/20 17:32:20]

Having it immediately before creating the new plugin makes the "only one plugin
at a time" guarantee explicit (if Javascript had dtors, I'd probably put the
removal code there). On the other hand, having it in onWcsLoaded_ better
expresses the "this function might be called more than once, so we'd better
reset to a sane state before continuing" idea. I prefer the former so unless you
feel strongly, I'll leave it as-is.

+  // in a new clientJid and a new callback. In this case, remove the old
+  // client plugin before instantiating a new one.
+  if (this.clientSession_) {
+    this.clientSession_.removePlugin();
+    this.clientSession_ = null;
+  }
+
   var securityTypes = 'third_party,spake2_pair,spake2_hmac,spake2_plain';
   this.clientSession_ = new remoting.ClientSession(
       this.hostJid_, this.clientJid_, this.hostPublicKey_, this.passPhrase_,
       this.fetchPin_, this.fetchThirdPartyToken_, securityTypes, this.hostId_,
       this.connectionMode_, this.hostDisplayName_, this.clientPairingId_,
       this.clientPairedSecret_);
   this.clientSession_.logHostOfflineErrors(!this.refreshHostJidIfOffline_);
   this.clientSession_.setOnStateChange(this.onStateChange_.bind(this));
   this.clientSession_.createPluginAndConnect(this.pluginParent_);
 };
@@ skipping 140 matching lines @@
  * Normalize the access code entered by the user.
  *
  * @param {string} accessCode The access code, as entered by the user.
  * @return {string} The normalized form of the code (whitespace removed).
  */
 remoting.SessionConnector.prototype.normalizeAccessCode_ =
     function(accessCode) {
   // Trim whitespace.
   return accessCode.replace(/\s/g, '');
 };