diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 21:02:39 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 21:02:39 +0000 |
| commit | 08128a313552198dce04295ad7e12071f4860161 (patch) | |
| tree | 34d0682f03badf0e0b6c27ff2b78da4289dca650 /remoting/host/heartbeat_sender_unittest.cc | |
| parent | 1e42174b401dbf8105ec4e5d864bad1c906c5717 (diff) | |
| download | chromium_src-08128a313552198dce04295ad7e12071f4860161.zip chromium_src-08128a313552198dce04295ad7e12071f4860161.tar.gz chromium_src-08128a313552198dce04295ad7e12071f4860161.tar.bz2 | |
Refactor SignalStrategy so that it can be reused for multiple connections.
Also updated SessionManager implementation so that session managers can
be created before signaling is connected.
BUG=107276
Review URL: http://codereview.chromium.org/9005034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/heartbeat_sender_unittest.cc')
| -rw-r--r-- | remoting/host/heartbeat_sender_unittest.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc index 4c3390a..b1de98b 100644 --- a/remoting/host/heartbeat_sender_unittest.cc +++ b/remoting/host/heartbeat_sender_unittest.cc @@ -64,12 +64,14 @@ TEST_F(HeartbeatSenderTest, DoSendStanza) { 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); |