Cleanup and simplify HostConfig and JsonHostConfig.

remoting/host/remoting_me2me_host.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 file implements a standalone host process for Me2Me, which is currently
 // used for the Linux-only Virtual Me2Me build.
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
@@ skipping 137 matching lines @@
   void StartWatchingNatPolicy() {
     nat_policy_.reset(
         policy_hack::NatPolicy::Create(file_io_thread_.message_loop_proxy()));
     nat_policy_->StartWatching(
         base::Bind(&HostProcess::OnNatPolicyUpdate, base::Unretained(this)));
   }
 
   // Read Host config from disk, returning true if successful.
   bool LoadConfig(base::MessageLoopProxy* io_message_loop,
                   bool* tokens_pending) {
-    scoped_refptr<JsonHostConfig> host_config =
-        new JsonHostConfig(host_config_path_, io_message_loop);
-    scoped_refptr<JsonHostConfig> auth_config =
-        new JsonHostConfig(auth_config_path_, io_message_loop);
+    JsonHostConfig host_config(host_config_path_);
+    JsonHostConfig auth_config(auth_config_path_);
 
     FilePath failed_path;
-    if (!host_config->Read()) {
+    if (!host_config.Read()) {
       failed_path = host_config_path_;
-    } else if (!auth_config->Read()) {
+    } else if (!auth_config.Read()) {
       failed_path = auth_config_path_;
     }
     if (!failed_path.empty()) {
       LOG(ERROR) << "Failed to read configuration file " << failed_path.value();
       return false;
     }
 
-    if (!host_config->GetString(kHostIdConfigPath, &host_id_)) {
+    if (!host_config.GetString(kHostIdConfigPath, &host_id_)) {
       LOG(ERROR) << "host_id is not defined in the config.";
       return false;
     }
 
     if (!key_pair_.Load(host_config)) {
       return false;
     }
 
     std::string host_secret_hash_string;
-    if (!host_config->GetString(kHostSecretHashConfigPath,
-                                &host_secret_hash_string)) {
+    if (!host_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 (!auth_config->GetString(kXmppLoginConfigPath, &xmpp_login_) ||
-        !(auth_config->GetString(kXmppAuthTokenConfigPath, &xmpp_auth_token_) ||
-          auth_config->GetString(kOAuthRefreshTokenConfigPath,
-                                 &oauth_refresh_token_))) {
+    if (!auth_config.GetString(kXmppLoginConfigPath, &xmpp_login_) ||
+        !(auth_config.GetString(kXmppAuthTokenConfigPath, &xmpp_auth_token_) ||
+          auth_config.GetString(kOAuthRefreshTokenConfigPath,
+                                &oauth_refresh_token_))) {
       LOG(ERROR) << "XMPP credentials are not defined in the config.";
       return false;
     }
 
     *tokens_pending = oauth_refresh_token_ != "";
     if (*tokens_pending) {
       xmpp_auth_token_ = "";  // This will be set to the access token later.
       xmpp_auth_service_ = "oauth2";
-    } else if (!auth_config->GetString(kXmppAuthServiceConfigPath,
-                                &xmpp_auth_service_)) {
+    } else if (!auth_config.GetString(kXmppAuthServiceConfigPath,
+                                      &xmpp_auth_service_)) {
       // For the me2me host, we default to ClientLogin token for chromiumsync
       // because earlier versions of the host had no HTTP stack with which to
       // request an OAuth2 access token.
       xmpp_auth_service_ = kChromotingTokenDefaultServiceName;
     }
     return true;
   }
 
   void OnNatPolicyUpdate(bool nat_traversal_enabled) {
     if (!context_->network_message_loop()->BelongsToCurrentThread()) {
@@ skipping 157 matching lines @@
 int CALLBACK WinMain(HINSTANCE instance,
                      HINSTANCE previous_instance,
                      LPSTR command_line,
                      int show_command) {
   // CommandLine::Init() ignores the passed |argc| and |argv| on Windows getting
   // the command line from GetCommandLineW(), so we can safely pass NULL here.
   return main(0, NULL);
 }
 
 #endif