Added HostConfig class. Changed SimpleHost to use it.

remoting/host/heartbeat_sender.cc

Index: remoting/host/heartbeat_sender.cc
diff --git a/remoting/host/heartbeat_sender.cc b/remoting/host/heartbeat_sender.cc
index 10fb3aa73cf060aa8d27e6f80da663c030c2ba44..4ce45b6270e76b566b55c0c39728cfe1da9fbc45 100644
--- a/remoting/host/heartbeat_sender.cc
+++ b/remoting/host/heartbeat_sender.cc
@@ -7,6 +7,7 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "remoting/base/constants.h"
+#include "remoting/host/host_config.h"
 #include "remoting/jingle_glue/iq_request.h"
 #include "remoting/jingle_glue/jingle_client.h"
 #include "remoting/jingle_glue/jingle_thread.h"
@@ -28,15 +29,14 @@ HeartbeatSender::HeartbeatSender()
     : started_(false) {
 }
 
-void HeartbeatSender::Start(JingleClient* jingle_client,
-                            const std::string& host_id) {
+void HeartbeatSender::Start(HostConfig* config, JingleClient* jingle_client) {
   DCHECK(jingle_client);
   DCHECK(!started_);
 
   started_ = true;
 
   jingle_client_ = jingle_client;
-  host_id_ = host_id;
+  config_ = config;
 
   jingle_client_->message_loop()->PostTask(
       FROM_HERE, NewRunnableMethod(this, &HeartbeatSender::DoStart));
@@ -58,7 +58,7 @@ void HeartbeatSender::DoSendStanza() {
   LOG(INFO) << "Sending heartbeat stanza to " << kChromotingBotJid;
 
   buzz::XmlElement* stanza = new buzz::XmlElement(kHeartbeatQuery);
-  stanza->AddAttr(kHostIdAttr, host_id_);
+  stanza->AddAttr(kHostIdAttr, config_->host_id());
   request_->SendIq(buzz::STR_SET, kChromotingBotJid, stanza);
 
   // Schedule next heartbeat.