Eliminated named constants for instances of remoting.Error.

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 28 matching lines @@
  * @constructor
  * @extends {base.EventSourceImpl}
  * @implements {base.Disposable}
  * @implements {remoting.ClientPlugin.ConnectionEventHandler}
  */
 remoting.ClientSession = function(plugin, host, signalStrategy, mode) {
   /** @private */
   this.state_ = remoting.ClientSession.State.CREATED;
 
   /** @private {!remoting.Error} */
-  this.error_ = remoting.Error.NONE;
+  this.error_ = remoting.Error.none();
 
   /** @private */
   this.host_ = host;
 
   /** @private */
   this.sessionId_ = '';
 
   /** @private */
   this.hasReceivedFrame_ = false;
   this.logToServer = new remoting.LogToServer(signalStrategy, mode);
@@ skipping 188 matching lines @@
 remoting.ClientSession.prototype.removePlugin = function() {
   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.
+ *    remoting.Error.none() if there is no error.
  * @return {void} Nothing.
  */
 remoting.ClientSession.prototype.disconnect = function(error) {
-  var state = error.isError() ?
-                  remoting.ClientSession.State.FAILED :
-                  remoting.ClientSession.State.CLOSED;
+  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.
@@ skipping 112 matching lines @@
  * @param {remoting.ClientSession.ConnectionError} error The plugin's error
  *        state, if any.
  */
 remoting.ClientSession.prototype.onConnectionStatusUpdate =
     function(status, error) {
   if (status == remoting.ClientSession.State.CONNECTED) {
     remoting.desktopConnectedView.onConnected();
   } else if (status == remoting.ClientSession.State.FAILED) {
     switch (error) {
       case remoting.ClientSession.ConnectionError.HOST_IS_OFFLINE:
-        this.error_ = remoting.Error.HOST_IS_OFFLINE;
+        this.error_ = new remoting.Error(
+            remoting.Error.Tag.HOST_IS_OFFLINE);
         break;
       case remoting.ClientSession.ConnectionError.SESSION_REJECTED:
-        this.error_ = remoting.Error.INVALID_ACCESS_CODE;
+        this.error_ = new remoting.Error(
+            remoting.Error.Tag.INVALID_ACCESS_CODE);
         break;
       case remoting.ClientSession.ConnectionError.INCOMPATIBLE_PROTOCOL:
-        this.error_ = remoting.Error.INCOMPATIBLE_PROTOCOL;
+        this.error_ = new remoting.Error(
+            remoting.Error.Tag.INCOMPATIBLE_PROTOCOL);
         break;
       case remoting.ClientSession.ConnectionError.NETWORK_FAILURE:
-        this.error_ = remoting.Error.P2P_FAILURE;
+        this.error_ = new remoting.Error(
+            remoting.Error.Tag.P2P_FAILURE);
         break;
       case remoting.ClientSession.ConnectionError.HOST_OVERLOAD:
-        this.error_ = remoting.Error.HOST_OVERLOAD;
+        this.error_ = new remoting.Error(
+            remoting.Error.Tag.HOST_OVERLOAD);
         break;
       default:
-        this.error_ = remoting.Error.UNEXPECTED;
+        this.error_ = remoting.Error.unexpected();
     }
   }
   this.setState_(status);
 };
 
 /**
  * Callback that the plugin invokes to indicate that the connection type for
  * a channel has changed.
  *
  * @param {string} channel The channel name.
@@ skipping 61 matching lines @@
  * @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 (this.state_ == remoting.ClientSession.State.CLOSED) {
       state = remoting.ClientSession.State.CONNECTION_CANCELED;
     } else if (this.state_ == remoting.ClientSession.State.FAILED &&
-        this.error_.tag == remoting.Error.Tag.HOST_IS_OFFLINE &&
+        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;
     }
   } else if (oldState == remoting.ClientSession.State.CONNECTED &&
              this.state_ == remoting.ClientSession.State.FAILED) {
     state = remoting.ClientSession.State.CONNECTION_DROPPED;
   }
@@ skipping 126 matching lines @@
   }
   /** @type {remoting.ClientSession} */
   var that = this;
 
   /** @param {string} token */
   var sendToken = function(token) {
     remoting.clientSession.sendClientMessage('accessToken', token);
   };
   /** @param {!remoting.Error} error */
   var sendError = function(error) {
-    console.log('Failed to refresh access token: ' + error);
+    console.log('Failed to refresh access token:', error.toString());

[Jamie, 2015/03/13 20:26:01]

Nit: When all objects are strings, plus is better than comma. It used to be the
case that Chrome only echoed the first argument to the terminal is was launched
from, so if we're ever looking at browser test output, for example, we'll lose
information. That may no longer be true (I haven't checked in a long time), but
plus is more prevalent elsewhere. I think I would still prefer an explicit call
to toString, since I'm not a big fan of implicit conversions.

[John Williams, 2015/03/13 22:40:30]

It still works the same way :(

   };
   remoting.identity.getNewToken().
       then(sendToken).
       catch(remoting.Error.handler(sendError));
   window.setTimeout(this.sendGoogleDriveAccessToken_.bind(this),
                     remoting.ACCESS_TOKEN_RESEND_INTERVAL_MS);
 };
 
 /**
  * Send a Cast extension message to the host.
@@ skipping 55 matching lines @@
  */
 remoting.ClientSession.prototype.enableDebugRegion = function(enable) {
   if (enable) {
     this.plugin_.setDebugDirtyRegionHandler(
         remoting.desktopConnectedView.handleDebugRegion.bind(
             remoting.desktopConnectedView));
   } else {
     this.plugin_.setDebugDirtyRegionHandler(null);
   }
 }