[Chromoting] Update client connection enums in JS to match C++.

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 32 matching lines @@
  * @constructor
  * @extends {base.EventSourceImpl}
  * @implements {base.Disposable}
  * @implements {remoting.ClientPlugin.ConnectionEventHandler}
  */
 remoting.ClientSession = function(plugin, host, signalStrategy, mode,
                                   onExtensionMessage) {
   base.inherits(this, base.EventSourceImpl);
 
   /** @private */
-  this.state_ = remoting.ClientSession.State.CREATED;
+  this.state_ = remoting.ClientSession.State.INITIALIZING;
 
   /** @private {!remoting.Error} */
   this.error_ = remoting.Error.none();
 
   /** @private */
   this.host_ = host;
 
   /** @private */
   this.sessionId_ = '';
 
@@ skipping 27 matching lines @@
   this.defineEvents(Object.keys(remoting.ClientSession.Events));
 };
 
 /** @enum {string} */
 remoting.ClientSession.Events = {
   stateChanged: 'stateChanged',
   videoChannelStateChanged: 'videoChannelStateChanged',
 };
 
 // Note that the positive values in both of these enums are copied directly
-// from chromoting_scriptable_object.h and must be kept in sync. The negative
-// values represent state transitions that occur within the web-app that have
-// no corresponding plugin state transition.
+// from connection_to_host.h and must be kept in sync. Code in
+// chromoting_instance.cc converts the C++ enums into strings that must match
+// the names given here.
+// The negative values represent state transitions that occur within the
+// web-app that have no corresponding plugin state transition.
 /** @enum {number} */
 remoting.ClientSession.State = {
   CONNECTION_CANCELED: -3,  // Connection closed (gracefully) before connecting.
   CONNECTION_DROPPED: -2,  // Succeeded, but subsequently closed with an error.
   CREATED: -1,
   UNKNOWN: 0,
-  CONNECTING: 1,
-  INITIALIZING: 2,
-  CONNECTED: 3,
-  CLOSED: 4,
-  FAILED: 5
+  INITIALIZING: 1,
+  CONNECTING: 2,
+  // We don't currently receive AUTHENTICATED from the host - it comes through
+  // as 'CONNECTING' instead.
+  // TODO(garykac) Update chromoting_instance.cc to send this once we've
+  // shipped a webapp release with support for AUTHENTICATED.
+  AUTHENTICATED: 3,
+  CONNECTED: 4,
+  CLOSED: 5,
+  FAILED: 6
 };
 
 /**
  * @param {string} state The state name.
  * @return {remoting.ClientSession.State} The session state enum value.
  */
 remoting.ClientSession.State.fromString = function(state) {
   if (!remoting.ClientSession.State.hasOwnProperty(state)) {
     throw "Invalid ClientSession.State: " + state;
   }
@@ skipping 352 matching lines @@
 
 /**
  * @param {remoting.ClientSession.State} newState The new state for the session.
  * @return {void} Nothing.
  * @private
  */
 remoting.ClientSession.prototype.setState_ = function(newState) {
   var oldState = this.state_;
   this.state_ = newState;
   var state = this.state_;
-  if (oldState == remoting.ClientSession.State.CONNECTING) {
+  if (oldState == remoting.ClientSession.State.CONNECTING ||
+      oldState == remoting.ClientSession.State.AUTHENTICATED) {
     if (this.state_ == remoting.ClientSession.State.CLOSED) {
       state = remoting.ClientSession.State.CONNECTION_CANCELED;
     } else if (this.state_ == remoting.ClientSession.State.FAILED &&
         this.error_.hasTag(remoting.Error.Tag.HOST_IS_OFFLINE) &&
         !this.logHostOfflineErrors_) {
       // The application requested host-offline errors to be suppressed, for
       // example, because this connection attempt is using a cached host JID.
       console.log('Suppressing host-offline error.');
       state = remoting.ClientSession.State.CONNECTION_CANCELED;
     }
@@ skipping 98 matching lines @@
     'https://docs.google.com/feeds/',
     'https://www.googleapis.com/auth/drive'
   ];
   remoting.identity.getNewToken(googleDriveScopes).
       then(sendToken).
       catch(remoting.Error.handler(sendError));
   window.setTimeout(this.sendGoogleDriveAccessToken_.bind(this),
                     remoting.ACCESS_TOKEN_RESEND_INTERVAL_MS);
 };