[Webapp Refactor] Removes the client plugin on disconnect.

remoting/webapp/crd/js/session_connector_impl.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 68 matching lines @@
   // Initialize/declare per-connection state.
   this.resetConnection_();
 };
 
 /**
  * Reset the per-connection state so that the object can be re-used for a
  * second connection. Note the none of the shared WCS state is reset.
  * @private
  */
 remoting.SessionConnectorImpl.prototype.resetConnection_ = function() {
-  this.removePlugin_();
+  this.closeSession();
 
   /** @private {remoting.Host} */
   this.host_ = null;
 
   /** @private {boolean} */
   this.logHostOfflineErrors_ = false;
 
   /** @private {remoting.ClientPlugin} */
   this.plugin_ = null;
 
@@ skipping 216 matching lines @@
   }
 };
 
 /**
  * Creates ClientSession object.
  */
 remoting.SessionConnectorImpl.prototype.createSession_ = function() {
   // In some circumstances, the WCS <iframe> can get reloaded, which results
   // in a new clientJid and a new callback. In this case, remove the old
   // client plugin before instantiating a new one.
-  this.removePlugin_();
+  this.closeSession();
 
   var pluginContainer = this.clientContainer_.querySelector(
       '.client-plugin-container');
 
   this.plugin_ = remoting.ClientPlugin.factory.createPlugin(
       pluginContainer, this.requiredCapabilities_);
 
   var that = this;
   this.host_.options.load().then(function(){
     that.plugin_.initialize(that.onPluginInitialized_.bind(that));
@@ skipping 38 matching lines @@
       this.host_, this.signalStrategy_.getJid(), this.credentialsProvider_);
 };
 
 /**
  * @param {!remoting.Error} error
  * @private
  */
 remoting.SessionConnectorImpl.prototype.pluginError_ = function(error) {
   this.signalStrategy_.setIncomingStanzaCallback(null);
   this.clientSession_.disconnect(error);
-  this.removePlugin_();
+  this.closeSession();
 };
 
-/** @private */
-remoting.SessionConnectorImpl.prototype.removePlugin_ = function() {
-  if (this.clientSession_) {
-    this.clientSession_.removePlugin();
-  }
+remoting.SessionConnectorImpl.prototype.closeSession = function() {
+  base.dispose(this.clientSession_);
   this.clientSession_ = null;
   remoting.clientSession = null;
 
   base.dispose(this.connectedView_);
   this.connectedView_ = null;
   remoting.desktopConnectedView = null;
 
   base.dispose(this.plugin_);
   this.plugin_ = null;
 };
@@ skipping 184 matching lines @@
  */
 remoting.DefaultSessionConnectorFactory.prototype.createConnector =
     function(clientContainer, onConnected, onError,
              onConnectionFailed, requiredCapabilities, defaultRemapKeys) {
   return new remoting.SessionConnectorImpl(clientContainer, onConnected,
                                            onError,
                                            onConnectionFailed,
                                            requiredCapabilities,
                                            defaultRemapKeys);
 };