Don't serialize config dictionary in Native Messaging interface.

remoting/webapp/host_dispatcher.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
  * This class provides an interface between the HostController and either the
  * NativeMessaging Host or the Host NPAPI plugin, depending on whether
  * NativeMessaging is supported. Since the test for NativeMessaging support is
  * asynchronous, this class stores any requests on a queue, pending the result
@@ skipping 110 matching lines @@
     case remoting.HostDispatcher.State.NATIVE_MESSAGING:
       this.nativeMessagingHost_.generateKeyPair(callback);
       break;
     case remoting.HostDispatcher.State.NPAPI:
       this.npapiHost_.generateKeyPair(callback);
       break;
   }
 };
 
 /**
- * @param {string} config
+ * @param {Object} config
  * @param {function(remoting.HostController.AsyncResult):void} callback
  * @return {void}
  */
 remoting.HostDispatcher.prototype.updateDaemonConfig = function(config,
                                                                 callback) {
   switch (this.state_) {
     case remoting.HostDispatcher.State.UNKNOWN:
       this.pendingRequests_.push(this.updateDaemonConfig.bind(this, callback));
       break;
     case remoting.HostDispatcher.State.NATIVE_MESSAGING:
       this.nativeMessagingHost_.updateDaemonConfig(config, callback);
       break;
     case remoting.HostDispatcher.State.NPAPI:
-      this.npapiHost_.updateDaemonConfig(config, callback);
+      this.npapiHost_.updateDaemonConfig(JSON.stringify(config), callback);
       break;
   }
-
 };
 
 /**
- * @param {function(string):void} callback
+ * @param {function(Object):void} callback
  * @return {void}
  */
 remoting.HostDispatcher.prototype.getDaemonConfig = function(callback) {
+  /**
+   * Converts the config string from the NPAPI plugin to an Object, to pass to
+   * |callback|.
+   * @param {string} configStr
+   * @return {void}
+   */
+  function callbackForNpapi(configStr) {
+    var config = null;
+    try {
+      config = JSON.parse(configStr);
+    } catch (err) {
+      // TODO(lambroslambrou): Call error handler here when that's implemented.
+    }
+    if (typeof(config) != 'object') {
+      config = null;

[Jamie, 2013/05/22 00:54:21]

Would this also be an error? If so, please move the TODO out of the catch block
and into this if block.

[Lambros, 2013/05/23 00:22:48]

Done.

+    }
+    callback(/** @type {Object} */ (config));
+  }
+
   switch (this.state_) {
     case remoting.HostDispatcher.State.UNKNOWN:
       this.pendingRequests_.push(this.getDaemonConfig.bind(this, callback));
       break;
     case remoting.HostDispatcher.State.NATIVE_MESSAGING:
       this.nativeMessagingHost_.getDaemonConfig(callback);
       break;
     case remoting.HostDispatcher.State.NPAPI:
-      this.npapiHost_.getDaemonConfig(callback);
+      this.npapiHost_.getDaemonConfig(callbackForNpapi);
       break;
   }
 };
 
 /**
  * @param {function(string):void} callback
  * @return {void}
  */
 remoting.HostDispatcher.prototype.getDaemonVersion = function(callback) {
   switch (this.state_) {
@@ skipping 22 matching lines @@
     case remoting.HostDispatcher.State.NATIVE_MESSAGING:
       this.nativeMessagingHost_.getUsageStatsConsent(callback);
       break;
     case remoting.HostDispatcher.State.NPAPI:
       this.npapiHost_.getUsageStatsConsent(callback);
       break;
   }
 };
 
 /**
- * @param {string} config
+ * @param {Object} config
  * @param {boolean} consent
  * @param {function(remoting.HostController.AsyncResult):void} callback
  * @return {void}
  */
 remoting.HostDispatcher.prototype.startDaemon = function(config, consent,
                                                          callback) {
   switch (this.state_) {
     case remoting.HostDispatcher.State.UNKNOWN:
       this.pendingRequests_.push(this.startDaemon.bind(this, config, consent,
                                                        callback));
       break;
     case remoting.HostDispatcher.State.NATIVE_MESSAGING:
       this.nativeMessagingHost_.startDaemon(config, consent, callback);
       break;
     case remoting.HostDispatcher.State.NPAPI:
-      this.npapiHost_.startDaemon(config, consent, callback);
+      this.npapiHost_.startDaemon(JSON.stringify(config), consent, callback);
       break;
   }
 };
 
 /**
  * @param {function(remoting.HostController.AsyncResult):void} callback
  * @return {void}
  */
 remoting.HostDispatcher.prototype.stopDaemon = function(callback) {
   switch (this.state_) {
@@ skipping 27 matching lines @@
       var state = this.npapiHost_.daemonState;
       if (state === undefined) {
         // If the plug-in can't be instantiated, for example on ChromeOS, then
         // return something sensible.
         state = remoting.HostController.State.NOT_IMPLEMENTED;
       }
       callback(state);
       break;
   }
 }