[Webapp Refactor] Removes the client plugin on disconnect.

remoting/webapp/crd/js/client_session.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.
 
 /**
  * @fileoverview
  * Class handling creation and teardown of a remoting client session.
  *
  * The ClientSession class controls lifetime of the client plugin
  * object and provides the plugin with the functionality it needs to
@@ skipping 223 matching lines @@
  *     the client and host.
  */
 remoting.ClientSession.prototype.hasCapability = function(capability) {
   if (this.capabilities_ == null)
     return false;
 
   return this.capabilities_.indexOf(capability) > -1;
 };
 
 /**
- * @return {void} Nothing.
- */
-remoting.ClientSession.prototype.removePlugin = function() {

[kelvinp, 2015/03/18 20:08:35]

This is a misleading name as it doesn't remove the plugin at all.  Renamed to
dispose() instead.

-  this.plugin_ = null;
-};
-
-/**
  * Disconnect the current session with a particular |error|.  The session will
  * raise a |stateChanged| event in response to it.  The caller should then call
  * dispose() to remove and destroy the <embed> element.
  *
  * @param {!remoting.Error} error The reason for the disconnection.  Use
  *    remoting.Error.none() if there is no error.
  * @return {void} Nothing.
  */
 remoting.ClientSession.prototype.disconnect = function(error) {
+  this.sendIq_(
+      '<cli:iq ' +
+          'to="' + this.host_.jabberId + '" ' +
+          'type="set" ' +
+          'id="session-terminate" ' +
+          'xmlns:cli="jabber:client">' +
+        '<jingle ' +
+            'xmlns="urn:xmpp:jingle:1" ' +
+            'action="session-terminate" ' +
+            'sid="' + this.sessionId_ + '">' +
+          '<reason><success/></reason>' +
+        '</jingle>' +
+      '</cli:iq>');
+
   var state = error.isNone() ?
                   remoting.ClientSession.State.CLOSED :
                   remoting.ClientSession.State.FAILED;
 
   // The plugin won't send a state change notification, so we explicitly log
   // the fact that the connection has closed.
   this.logToServer.logClientSessionStateChange(state, error);
   this.error_ = error;
   this.setState_(state);
 };
 
 /**
  * Deletes the <embed> element from the container and disconnects.
  *
  * @return {void} Nothing.
  */
 remoting.ClientSession.prototype.dispose = function() {
-  this.sendIq_(
-      '<cli:iq ' +
-          'to="' + this.host_.jabberId + '" ' +
-          'type="set" ' +
-          'id="session-terminate" ' +
-          'xmlns:cli="jabber:client">' +
-        '<jingle ' +
-            'xmlns="urn:xmpp:jingle:1" ' +
-            'action="session-terminate" ' +
-            'sid="' + this.sessionId_ + '">' +
-          '<reason><success/></reason>' +
-        '</jingle>' +
-      '</cli:iq>');
-  this.removePlugin();
+  this.plugin_ = null;
 };
 
 /**
  * @return {remoting.ClientSession.State} The current state.
  */
 remoting.ClientSession.prototype.getState = function() {
   return this.state_;
 };
 
 /**
@@ skipping 318 matching lines @@
  */
 remoting.ClientSession.prototype.enableDebugRegion = function(enable) {
   if (enable) {
     this.plugin_.setDebugDirtyRegionHandler(
         remoting.desktopConnectedView.handleDebugRegion.bind(
             remoting.desktopConnectedView));
   } else {
     this.plugin_.setDebugDirtyRegionHandler(null);
   }
 }