Don't serialize config dictionary in Native Messaging interface.

remoting/webapp/host_controller.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.
 
 'use strict';
 
 /** @suppress {duplicate} */
 var remoting = remoting || {};
 
 /** @constructor */
@@ skipping 120 matching lines @@
 
   /**
    * @param {string} hostName
    * @param {string} publicKey
    * @param {string} privateKey
    * @param {XMLHttpRequest} xhr
    * @param {string} hostSecretHash
    */
   function startHostWithHash(hostName, publicKey, privateKey, xhr,
                              hostSecretHash) {
-    var hostConfig = JSON.stringify({
+    var hostConfig = {
         xmpp_login: remoting.identity.getCachedEmail(),
         oauth_refresh_token: remoting.oauth2.exportRefreshToken(),
         host_id: newHostId,
         host_name: hostName,
         host_secret_hash: hostSecretHash,
         private_key: privateKey
-    });
+    };
     /** @param {remoting.HostController.AsyncResult} result */
     var onStartDaemon = function(result) {
       onStarted(callback, result, hostName, publicKey);
     };
     that.hostDispatcher_.startDaemon(hostConfig, consent, onStartDaemon);
   }
 
   /**
    * @param {string} hostName
    * @param {string} privateKey
@@ skipping 79 matching lines @@
       callback(result);
       return;
     }
     that.getLocalHostId(unregisterHost.bind(null, result));
   };
 
   this.hostDispatcher_.stopDaemon(onStopped);
 };
 
 /**
- * Parse a stringified host configuration and return it as a dictionary if it
- * is well-formed and contains both host_id and xmpp_login keys.  null is
- * returned if either key is missing, or if the configuration is corrupt.
- * @param {string} configStr The host configuration, JSON encoded to a string.
- * @return {Object.<string,string>|null} The host configuration.
+ * Check the host configuration is valid (non-null, and contains both host_id
+ * and xmpp_login keys).
+ * @param {Object} config The host configuration.
+ * @return {boolean} True if it is valid.
  */
-function parseHostConfig_(configStr) {
-  var config = /** @type {Object.<string,string>} */ jsonParseSafe(configStr);
-  if (config &&
-      typeof config['host_id'] == 'string' &&
-      typeof config['xmpp_login'] == 'string') {
-    return config;
-  } else {
-    // {} means that host is not configured; '' means that the config file could
-    // not be read.
-    // TODO(jamiewalch): '' is expected if the host isn't installed, but should
-    // be reported as an error otherwise. Fix this once we have an event-based
-    // daemon state mechanism.
-    if (configStr != '{}' && configStr != '') {
-      console.error('Invalid getDaemonConfig response.');
-    }
-  }
-  return null;
+function isHostConfigValid_(config) {
+  return !!config && typeof config['host_id'] == 'string' &&
+      typeof config['xmpp_login'] == 'string';
 }
 
 /**
  * @param {string} newPin The new PIN to set
  * @param {function(remoting.HostController.AsyncResult):void} callback
  *     Callback to be called when finished.
  * @return {void} Nothing.
  */
 remoting.HostController.prototype.updatePin = function(newPin, callback) {
   /** @type {remoting.HostController} */
   var that = this;
 
-  /** @param {string} configStr */
-  function onConfig(configStr) {
-    var config = parseHostConfig_(configStr);
-    if (!config) {
+  /** @param {Object} config */
+  function onConfig(config) {
+    if (!isHostConfigValid_(config)) {
       callback(remoting.HostController.AsyncResult.FAILED);
       return;
     }
+    /** @type {string} */
     var hostId = config['host_id'];
     that.hostDispatcher_.getPinHash(hostId, newPin, updateDaemonConfigWithHash);
   }
 
   /** @param {string} pinHash */
   function updateDaemonConfigWithHash(pinHash) {
-    var newConfig = JSON.stringify({
-        host_secret_hash: pinHash
-      });
+    var newConfig = {
+      host_secret_hash: pinHash
+    };
     that.hostDispatcher_.updateDaemonConfig(newConfig, callback);
   }
 
   // TODO(sergeyu): When crbug.com/121518 is fixed: replace this call
-  // with an upriveleged version if that is necessary.
+  // with an unprivileged version if that is necessary.
   this.hostDispatcher_.getDaemonConfig(onConfig);
 };
 
 /**
  * Get the state of the local host.
  *
  * @param {function(remoting.HostController.State):void} onDone
  *     Completion callback.
  */
 remoting.HostController.prototype.getLocalHostState = function(onDone) {
   this.hostDispatcher_.getDaemonState(onDone);
 };
 
 /**
  * Get the id of the local host, or null if it is not registered.
  *
  * @param {function(string?):void} onDone Completion callback.
  */
 remoting.HostController.prototype.getLocalHostId = function(onDone) {
   /** @type {remoting.HostController} */
   var that = this;
-  /** @param {string} configStr */
-  function onConfig(configStr) {
-    var config = parseHostConfig_(configStr);
+  /** @param {Object} config */
+  function onConfig(config) {
     var hostId = null;
-    if (config) {
-      hostId = config['host_id'];
+    if (isHostConfigValid_(config)) {
+      hostId = /** @type {string} */ config['host_id'];
     }
     onDone(hostId);
   };
   try {
     this.hostDispatcher_.getDaemonConfig(onConfig);
   } catch (err) {
     onDone(null);
   }
 };
 
 /** @type {remoting.HostController} */
 remoting.hostController = null;