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

remoting/host/register_support_host_request_unittest.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/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
@@ skipping 58 matching lines @@
 
   scoped_ptr<RegisterSupportHostRequest> request(
       new RegisterSupportHostRequest());
   ASSERT_TRUE(request->Init(
       config_, base::Bind(&MockCallback::OnResponse,
                           base::Unretained(&callback_))));
 
   XmlElement* sent_iq = NULL;
   EXPECT_CALL(signal_strategy_, GetNextId())
       .WillOnce(Return(kStanzaId));
+  EXPECT_CALL(signal_strategy_, GetLocalJid())
+      .WillRepeatedly(Return(kTestJid));
   EXPECT_CALL(signal_strategy_, SendStanza(NotNull()))
       .WillOnce(DoAll(SaveArg<0>(&sent_iq), Return(true)));
 
-  request->OnSignallingConnected(&signal_strategy_, kTestJid);
+  request->OnSignallingConnected(&signal_strategy_);
   message_loop_.RunAllPending();
 
   // Verify format of the query.
   scoped_ptr<XmlElement> stanza(sent_iq);
   ASSERT_TRUE(stanza != NULL);
 
   EXPECT_EQ(stanza->Attr(buzz::QName("", "to")),
             std::string(kChromotingBotJid));
   EXPECT_EQ(stanza->Attr(buzz::QName("", "type")), "set");
 
@@ skipping 34 matching lines @@
   XmlElement* support_id = new XmlElement(
       QName(kChromotingXmlNamespace, "support-id"));
   support_id->AddText(kSupportId);
   result->AddElement(support_id);
 
   XmlElement* support_id_lifetime = new XmlElement(
       QName(kChromotingXmlNamespace, "support-id-lifetime"));
   support_id_lifetime->AddText(kSupportIdLifetime);
   result->AddElement(support_id_lifetime);
 
-  EXPECT_TRUE(listener->OnIncomingStanza(response.get()));
+  EXPECT_TRUE(listener->OnSignalStrategyIncomingStanza(response.get()));
   message_loop_.RunAllPending();
 
   EXPECT_CALL(signal_strategy_, RemoveListener(listener));
 }
 
 }  // namespace remoting