Refactor SignalStrategy so that it can be reused for multiple connections.

remoting/host/heartbeat_sender.cc

 // Copyright (c) 2011 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/heartbeat_sender.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_number_conversions.h"
@@ skipping 47 matching lines @@
 
   if (!key_pair_.Load(config_)) {
     return false;
   }
 
   state_ = INITIALIZED;
 
   return true;
 }
 
-void HeartbeatSender::OnSignallingConnected(SignalStrategy* signal_strategy,
-                                            const std::string& full_jid) {
+void HeartbeatSender::OnSignallingConnected(SignalStrategy* signal_strategy) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK(state_ == INITIALIZED || state_ == STOPPED);
   state_ = STARTED;
 
-  full_jid_ = full_jid;
+  full_jid_ = signal_strategy->GetLocalJid();
 
   iq_sender_.reset(new IqSender(signal_strategy));
 
   DoSendStanza();
   timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(interval_ms_), this,
                &HeartbeatSender::DoSendStanza);
 }
 
 void HeartbeatSender::OnSignallingDisconnected() {
   DCHECK(message_loop_->BelongsToCurrentThread());
@@ skipping 84 matching lines @@
       QName(kChromotingXmlNamespace, kSignatureTimeAttr), time_str);
 
   std::string message = full_jid_ + ' ' + time_str;
   std::string signature(key_pair_.GetSignature(message));
   signature_tag->AddText(signature);
 
   return signature_tag;
 }
 
 }  // namespace remoting