Cleanup and simplify HostConfig and JsonHostConfig.

remoting/host/simple_host_process.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.
 //
 // This is an application of a minimal host process in a Chromoting
 // system. It serves the purpose of gluing different pieces together
 // to make a functional host process for testing.
 //
 // It peforms the following functionality:
 // 1. Connect to the GTalk network and register the machine as a host.
@@ skipping 86 matching lines @@
         context_(NULL, message_loop_.message_loop_proxy()),
         fake_(false),
         is_it2me_(false) {
     context_.Start();
     file_io_thread_.Start();
     network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
   }
 
   int Run() {
     FilePath config_path = GetConfigPath();
-    scoped_refptr<JsonHostConfig> config = new JsonHostConfig(
-        config_path, file_io_thread_.message_loop_proxy());
-    if (!config->Read()) {
+    JsonHostConfig config(config_path);
+    if (!config.Read()) {
       LOG(ERROR) << "Failed to read configuration file "
                  << config_path.value();
       return 1;
     }
 
-    if (!config->GetString(kHostIdConfigPath, &host_id_)) {
+    if (!config.GetString(kHostIdConfigPath, &host_id_)) {
       LOG(ERROR) << "host_id is not defined in the config.";
       return 1;
     }
 
     if (!key_pair_.Load(config)) {
       return 1;
     }
 
     std::string host_secret_hash_string;
-    if (!config->GetString(kHostSecretHashConfigPath,
-                           &host_secret_hash_string)) {
+    if (!config.GetString(kHostSecretHashConfigPath,
+                          &host_secret_hash_string)) {
       host_secret_hash_string = "plain:";
     }
 
     if (!host_secret_hash_.Parse(host_secret_hash_string)) {
       LOG(ERROR) << "Invalid host_secret_hash.";
       return false;
     }
 
     // Use an XMPP connection to the Talk network for session signalling.
-    if (!config->GetString(kXmppLoginConfigPath, &xmpp_login_) ||
-        !config->GetString(kXmppAuthTokenConfigPath, &xmpp_auth_token_)) {
+    if (!config.GetString(kXmppLoginConfigPath, &xmpp_login_) ||
+        !config.GetString(kXmppAuthTokenConfigPath, &xmpp_auth_token_)) {
       LOG(ERROR) << "XMPP credentials are not defined in the config.";
       return 1;
     }
-    if (!config->GetString(kXmppAuthServiceConfigPath, &xmpp_auth_service_)) {
+    if (!config.GetString(kXmppAuthServiceConfigPath, &xmpp_auth_service_)) {
       // For the simple host, we assume we always use the ClientLogin token for
       // chromiumsync because we do not have an HTTP stack with which we can
       // easily request an OAuth2 access token even if we had a RefreshToken for
       // the account.
       xmpp_auth_service_ = kChromotingTokenDefaultServiceName;
     }
 
     context_.network_message_loop()->PostTask(FROM_HERE, base::Bind(
         &SimpleHost::StartHost, base::Unretained(this)));
 
@@ skipping 219 matching lines @@
         max_port < 0 || max_port > 65535) {
       LOG(ERROR) << "Invalid max-port value: " << max_port
                  << ". Expected integer in range [0, 65535].";
       return 1;
     }
     simple_host.network_settings()->max_port = max_port;
   }
 
   return simple_host.Run();
 }