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

remoting/host/register_support_host_request.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/register_support_host_request.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
@@ skipping 35 matching lines @@
                                       const RegisterCallback& callback) {
   callback_ = callback;
 
   if (!key_pair_.Load(config)) {
     return false;
   }
   return true;
 }
 
 void RegisterSupportHostRequest::OnSignallingConnected(
-    SignalStrategy* signal_strategy,
-    const std::string& jid) {
+    SignalStrategy* signal_strategy) {
   DCHECK(!callback_.is_null());
 
   message_loop_ = MessageLoop::current();
 
   iq_sender_.reset(new IqSender(signal_strategy));
   request_.reset(iq_sender_->SendIq(
-      buzz::STR_SET, kChromotingBotJid, CreateRegistrationRequest(jid),
+      buzz::STR_SET, kChromotingBotJid,
+      CreateRegistrationRequest(signal_strategy->GetLocalJid()),
       base::Bind(&RegisterSupportHostRequest::ProcessResponse,
                  base::Unretained(this))));
 }
 
 void RegisterSupportHostRequest::OnSignallingDisconnected() {
   if (!message_loop_) {
     // We will reach here with |message_loop_| NULL if the Host's
     // XMPP connection attempt fails.
     CHECK(!callback_.is_null());
     DCHECK(!request_.get());
@@ skipping 104 matching lines @@
 
 void RegisterSupportHostRequest::ProcessResponse(const XmlElement* response) {
   DCHECK_EQ(message_loop_, MessageLoop::current());
   std::string support_id;
   base::TimeDelta lifetime;
   bool success = ParseResponse(response, &support_id, &lifetime);
   callback_.Run(success, support_id, lifetime);
 }
 
 }  // namespace remoting