Remove dependency on HostConfig from ChromotingHost and other classes.

Remove dependency on HostConfig from ChromotingHost, 
RegisterSupportHostRequest and HeartbeatSender. Also replaced
ChromotingHost::SetSharedSecret() with SetAuthenticatorFactory() to 
support new authentication mechanism.

BUG=105214


Review URL: http://codereview.chromium.org/9022045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116818 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 19 deletions

diff --git a/remoting/host/register_support_host_request.cc b/remoting/host/register_support_host_request.cc
index 63caadf..010ab6e 100644
--- a/remoting/host/register_support_host_request.cc
+++ b/remoting/host/register_support_host_request.cc
@@ -35,8 +35,17 @@ const char kSupportIdTag[] = "support-id";
 const char kSupportIdLifetimeTag[] = "support-id-lifetime";
 }
 
-RegisterSupportHostRequest::RegisterSupportHostRequest()
-    : signal_strategy_(NULL) {
+RegisterSupportHostRequest::RegisterSupportHostRequest(
+    SignalStrategy* signal_strategy,
+    HostKeyPair* key_pair,
+    const RegisterCallback& callback)
+    : signal_strategy_(signal_strategy),
+      key_pair_(key_pair),
+      callback_(callback) {
+  DCHECK(signal_strategy_);
+  DCHECK(key_pair_);
+  signal_strategy_->AddListener(this);
+  iq_sender_.reset(new IqSender(signal_strategy_));
 }
 
 RegisterSupportHostRequest::~RegisterSupportHostRequest() {
@@ -44,21 +53,6 @@ RegisterSupportHostRequest::~RegisterSupportHostRequest() {
     signal_strategy_->RemoveListener(this);
 }
 
-bool RegisterSupportHostRequest::Init(SignalStrategy* signal_strategy,
-                                      HostConfig* config,
-                                      const RegisterCallback& callback) {
-  if (!key_pair_.Load(config)) {
-    return false;
-  }
-
-  callback_ = callback;
-  signal_strategy_ = signal_strategy;
-  signal_strategy_->AddListener(this);
-  iq_sender_.reset(new IqSender(signal_strategy_));
-
-  return true;
-}
-
 void RegisterSupportHostRequest::OnSignalStrategyStateChange(
     SignalStrategy::State state) {
   if (state == SignalStrategy::CONNECTED) {
@@ -86,7 +80,7 @@ XmlElement* RegisterSupportHostRequest::CreateRegistrationRequest(
       QName(kChromotingXmlNamespace, kRegisterQueryTag));
   XmlElement* public_key = new XmlElement(
       QName(kChromotingXmlNamespace, kPublicKeyTag));
-  public_key->AddText(key_pair_.GetPublicKey());
+  public_key->AddText(key_pair_->GetPublicKey());
   query->AddElement(public_key);
   query->AddElement(CreateSignature(jid));
   return query;
@@ -103,7 +97,7 @@ XmlElement* RegisterSupportHostRequest::CreateSignature(
       QName(kChromotingXmlNamespace, kSignatureTimeAttr), time_str);
 
   std::string message = jid + ' ' + time_str;
-  std::string signature(key_pair_.GetSignature(message));
+  std::string signature(key_pair_->GetSignature(message));
   signature_tag->AddText(signature);
 
   return signature_tag;