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

remoting/host/heartbeat_sender_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/heartbeat_sender.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_number_conversions.h"
@@ skipping 46 matching lines @@
 TEST_F(HeartbeatSenderTest, DoSendStanza) {
   SignalStrategy::Listener* listener;
   EXPECT_CALL(signal_strategy_, AddListener(NotNull()))
       .WillOnce(SaveArg<0>(&listener));
 
   scoped_ptr<HeartbeatSender> heartbeat_sender(
       new HeartbeatSender(base::MessageLoopProxy::current(), config_));
   ASSERT_TRUE(heartbeat_sender->Init());
 
   XmlElement* sent_iq = NULL;
+  EXPECT_CALL(signal_strategy_, GetLocalJid())
+      .WillRepeatedly(Return(kTestJid));
   EXPECT_CALL(signal_strategy_, GetNextId())
       .WillOnce(Return(kStanzaId));
   EXPECT_CALL(signal_strategy_, SendStanza(NotNull()))
       .WillOnce(DoAll(SaveArg<0>(&sent_iq), Return(true)));
 
-  heartbeat_sender->OnSignallingConnected(&signal_strategy_, kTestJid);
+  heartbeat_sender->OnSignallingConnected(&signal_strategy_);
   message_loop_.RunAllPending();
 
   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");
 
   EXPECT_CALL(signal_strategy_, RemoveListener(listener));
@@ skipping 58 matching lines @@
 
   scoped_ptr<HeartbeatSender> heartbeat_sender(
       new HeartbeatSender(base::MessageLoopProxy::current(),
                           config_));
   heartbeat_sender->ProcessResponse(response.get());
 
   EXPECT_EQ(kTestInterval * 1000, heartbeat_sender->interval_ms_);
 }
 
 }  // namespace remoting