Cleanup and simplify HostConfig and JsonHostConfig.

remoting/host/host_key_pair.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/host_key_pair.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 26 matching lines @@
   std::vector<uint8> key_buf(key_str.begin(), key_str.end());
   key_.reset(crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_buf));
   if (key_.get() == NULL) {
     LOG(ERROR) << "Invalid private key.";
     return false;
   }
 
   return true;
 }
 
-bool HostKeyPair::Load(HostConfig* host_config) {
+bool HostKeyPair::Load(const HostConfig& host_config) {
   std::string key_base64;
-  if (!host_config->GetString(kPrivateKeyConfigPath, &key_base64)) {
+  if (!host_config.GetString(kPrivateKeyConfigPath, &key_base64)) {
     LOG(ERROR) << "Private key wasn't found in the config file.";
     return false;
   }
   return LoadFromString(key_base64);
 }
 
 void HostKeyPair::Save(MutableHostConfig* host_config) {
   host_config->SetString(kPrivateKeyConfigPath, GetAsString());
 }
 
@@ skipping 46 matching lines @@
           base::RandInt(1, std::numeric_limits<int>::max()),
           base::TimeDelta::FromDays(1));
   std::string encoded;
   bool result = net::X509Certificate::GetDEREncoded(cert->os_cert_handle(),
                                                     &encoded);
   CHECK(result);
   return encoded;
 }
 
 }  // namespace remoting