Cleanup and simplify HostConfig and JsonHostConfig.

remoting/host/plugin/daemon_controller_mac.cc

 // 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.
 
 #include "remoting/host/plugin/daemon_controller.h"
 
 #include <launch.h>
 #include <sys/types.h>
 
 #include "base/basictypes.h"
@@ skipping 118 matching lines @@
   done_callback.Run(RESULT_FAILED);
 }
 
 void DaemonControllerMac::Stop(const CompletionCallback& done_callback) {
   auth_thread_.message_loop_proxy()->PostTask(
       FROM_HERE, base::Bind(
           &DaemonControllerMac::DoStop, base::Unretained(this), done_callback));
 }
 
 void DaemonControllerMac::DoGetConfig(const GetConfigCallback& callback) {
-  JsonHostConfig host_config(FilePath(kHostConfigFile),
-                             base::MessageLoopProxy::current());
-  host_config.Read();
+  FilePath config_path(kHostConfigFile);
+  JsonHostConfig host_config(config_path);
+  scoped_ptr<base::DictionaryValue> config;
 
-  scoped_ptr<base::DictionaryValue> config(new base::DictionaryValue());
-
-  const char* key = "host_id";
-  std::string value;
-  if (host_config.GetString(key, &value))
-    config.get()->SetString(key, value);
-  key = "xmpp_login";
-  if (host_config.GetString(key, &value))
-    config.get()->SetString(key, value);
+  if (host_config.Read()) {
+    config.reset(new base::DictionaryValue());
+    std::string value;
+    if (host_config.GetString(kHostIdConfigPath, &value))
+      config.get()->SetString(kHostIdConfigPath, value);
+    if (host_config.GetString(kXmppLoginConfigPath, &value))
+      config.get()->SetString(kXmppLoginConfigPath, value);
+  }
 
   callback.Run(config.Pass());
 }
 
 void DaemonControllerMac::DoSetConfigAndStart(
     scoped_ptr<base::DictionaryValue> config,
     const CompletionCallback& done_callback) {
   // JsonHostConfig doesn't provide a way to save on the current thread, wait
   // for completion, and know whether the save succeeded.  Instead, use
   // base::JSONWriter directly.
@@ skipping 86 matching lines @@
   return true;
 }
 
 }  // namespace
 
 scoped_ptr<DaemonController> remoting::DaemonController::Create() {
   return scoped_ptr<DaemonController>(new DaemonControllerMac());
 }
 
 }  // namespace remoting