Cleanup error handling in the client plugin.

remoting/webapp/client_plugin_async.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 that wraps low-level details of interacting with the client plugin.
  *
  * This abstracts a <embed> element and controls the plugin which does
  * the actual remoting work. It also handles differences between
@@ skipping 101 matching lines @@
     this.onOutgoingIqHandler(message.data['iq']);
   } else if (message.method == 'logDebugMessage') {
     if (typeof message.data['message'] != 'string') {
       console.error('Received invalid logDebugMessage message: ' + message_str);
       return;
     }
     this.onDebugMessageHandler(message.data['message']);
   } else if (message.method == 'onConnectionStatus') {
     if (typeof message.data['state'] != 'string' ||
         !(message.data['state'] in remoting.ClientSession.State) ||
-        typeof message.data['error'] != 'string' ||
-        !(message.data['error'] in remoting.ClientSession.ConnectionError)) {
+        typeof message.data['error'] != 'string') {
       console.error('Received invalid onConnectionState message: ' +
                     message_str);
       return;
     }
+
     /** @type {remoting.ClientSession.State} */
     var state = remoting.ClientSession.State[message.data['state']];
-    /** @type {remoting.ClientSession.ConnectionError} */
-    var error = remoting.ClientSession.ConnectionError[message.data['error']];
+    var error;
+    if (message.data['error'] in remoting.ClientSession.ConnectionError) {
+      error = /** @type {remoting.ClientSession.ConnectionError} */
+          remoting.ClientSession.ConnectionError[message.data['error']];
+    } else {
+      error = remoting.ClientSession.ConnectionError.UNKNOWN;
+    }
+
     this.onConnectionStatusUpdateHandler(state, error);
   } else if (message.method == 'onDesktopSize') {
     if (typeof message.data['width'] != 'number' ||
         typeof message.data['height'] != 'number') {
       console.error('Received invalid onDesktopSize message: ' + message_str);
       return;
     }
     this.desktopWidth = /** @type {number} */ message.data['width'];
     this.desktopHeight = /** @type {number} */ message.data['height'];
     this.onDesktopSizeUpdateHandler();
@@ skipping 119 matching lines @@
 };
 
 /**
  * Returns an associative array with a set of stats for this connecton.
  *
  * @return {remoting.ClientSession.PerfStats} The connection statistics.
  */
 remoting.ClientPluginAsync.prototype.getPerfStats = function() {
   return this.perfStats_;
 };