Get host id via getDaemonConfig.

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 102 matching lines @@
     var e = new Array();
     for (var i = 0; i < 8; i++) {
       e[i] = (/** @type {number} */random[i] + 0x10000).
           toString(16).substring(1);
     }
     return e[0] + e[1] + '-' + e[2] + "-" + e[3] + '-' +
         e[4] + '-' + e[5] + e[6] + e[7];
   };
 
   var newHostId = generateUuid();
-  // TODO(jamiewalch): Create an unprivileged API to get the host id from the
-  // plugin instead of storing it locally (crbug.com/121518).
-  window.localStorage.setItem('me2me-host-id', newHostId);
 
   /** @param {function(remoting.HostController.AsyncResult):void} callback
    *  @param {remoting.HostController.AsyncResult} result
    *  @param {string} hostName */
   function onStarted(callback, result, hostName) {
     if (result == remoting.HostController.AsyncResult.OK) {
       // Create a dummy remoting.Host instance to represent the local host.
       // Refreshing the list is no good in general, because the directory
       // information won't be in sync for several seconds. We don't know the
       // host JID or public key, but they can be missing from the cache with
@@ skipping 81 matching lines @@
  * @return {void} Nothing.
  */
 remoting.HostController.prototype.stop = function(callback) {
   /** @type {remoting.HostController} */
   var that = this;
 
   /** @param {remoting.HostController.AsyncResult} result */
   function onStopped(result) {
     if (that.localHost && that.localHost.hostId)
       remoting.HostList.unregisterHostById(that.localHost.hostId);
-    window.localStorage.removeItem('me2me-host-id');
     callback(result);
   };
   this.plugin_.stopDaemon(onStopped);
 };
 
 /**
  * @param {string} newPin The new PIN to set
  * @param {function(remoting.HostController.AsyncResult):void} callback
  *     Callback to be called when finished.
  * @return {void} Nothing.
@@ skipping 59 matching lines @@
     this.hostTableEntry_ = null;
   }
 };
 
 /**
  * Update the internal state so that the local host can be correctly filtered
  * out of the host list.
  *
  * @param {remoting.HostList} hostList The new host list, returned by the
  *     Chromoting service.
- * @param {function():void} onDone Completion callback. TODO(jamiewalch): For
- *     now, this is synchronous and reads the host id from local storage. In
- *     the future, it will asynchronously read the host id from the plugin
- *     (crbug.com/121518).
+ * @param {function():void} onDone Completion callback.
  */
 remoting.HostController.prototype.onHostListRefresh =
     function(hostList, onDone) {
-  var hostId = window.localStorage.getItem('me2me-host-id');
-  if (hostId && typeof(hostId) == 'string') {
-    this.setHost(hostList.getHostForId(/** @type{string} */(hostId)));
-  } else {
-    this.setHost(null);
-  }
-  onDone();
+  /** @type {remoting.HostController} */
+  var that = this;
+  /** @param {string} configStr */
+  function onConfig(configStr) {
+    var config = /** @type {Object.<string,string>} */ JSON.parse(configStr);
+    if (('host_id' in config) && typeof config['host_id'] == 'string') {
+      var hostId = config['host_id'];

[simonmorris, 2012/04/23 17:29:18]

It's less repetitive to test for hostId not being undefined. I think 'if
(hostId) { ... }' can replace the previous 'if'. For optional awesomeness, make
getHostForId map undefined to null, and remove the 'if' entirely.

[Jamie, 2012/04/23 20:24:25]

I want to check that host_id is a string, but you're right that there's no need
for an existence-check so I've removed that. I'm not sure I like the idea of
making getHostForId check for undefined, if only because it would effectively
make the hostId parameter optional (at least from a JSDoc point-of-view) and we
don't want that.

Of course, this is largely moot because getHostForId will return NULL for
anything the 'if' filters, and it's hard to imagine it ever doing anything else,
but I'd rather not rely on that.

+      that.setHost(hostList.getHostForId(hostId));
+    } else {
+      that.setHost(null);
+    }
+    onDone();
+  };
+  this.plugin_.getDaemonConfig(onConfig);
 };
 
 /** @type {remoting.HostController} */
 remoting.hostController = null;