diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-23 12:06:19 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-23 12:06:19 +0000 |
| commit | cff2764267289815ebab479e962d066706ccdcac (patch) | |
| tree | 5b8149ed2cde6f99f1368fa086972f8bc5db23a8 /remoting/host/heartbeat_sender_unittest.cc | |
| parent | 4513eb18159fb35272cd619785a3b8295b4a6467 (diff) | |
| download | chromium_src-cff2764267289815ebab479e962d066706ccdcac.zip chromium_src-cff2764267289815ebab479e962d066706ccdcac.tar.gz chromium_src-cff2764267289815ebab479e962d066706ccdcac.tar.bz2 | |
Use scoped_ptr to pass ownership in SignalStrategy.
Updated SignalStrategy and some other code where we pass ownership of
XML objects.
Review URL: http://codereview.chromium.org/9453001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/heartbeat_sender_unittest.cc')
| -rw-r--r-- | remoting/host/heartbeat_sender_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc index 111f19d..08f3267 100644 --- a/remoting/host/heartbeat_sender_unittest.cc +++ b/remoting/host/heartbeat_sender_unittest.cc @@ -87,7 +87,7 @@ TEST_F(HeartbeatSenderTest, DoSendStanza) { .WillRepeatedly(Return(kTestJid)); EXPECT_CALL(signal_strategy_, GetNextId()) .WillOnce(Return(kStanzaId)); - EXPECT_CALL(signal_strategy_, SendStanza(NotNull())) + EXPECT_CALL(signal_strategy_, SendStanzaPtr(NotNull())) .WillOnce(DoAll(SaveArg<0>(&sent_iq), Return(true))); heartbeat_sender_->OnSignalStrategyStateChange(SignalStrategy::CONNECTED); @@ -109,7 +109,7 @@ TEST_F(HeartbeatSenderTest, DoSendStanzaTwice) { .WillRepeatedly(Return(kTestJid)); EXPECT_CALL(signal_strategy_, GetNextId()) .WillOnce(Return(kStanzaId)); - EXPECT_CALL(signal_strategy_, SendStanza(NotNull())) + EXPECT_CALL(signal_strategy_, SendStanzaPtr(NotNull())) .WillOnce(DoAll(SaveArg<0>(&sent_iq), Return(true))); heartbeat_sender_->OnSignalStrategyStateChange(SignalStrategy::CONNECTED); @@ -126,7 +126,7 @@ TEST_F(HeartbeatSenderTest, DoSendStanzaTwice) { .WillRepeatedly(Return(kTestJid)); EXPECT_CALL(signal_strategy_, GetNextId()) .WillOnce(Return(kStanzaId + 1)); - EXPECT_CALL(signal_strategy_, SendStanza(NotNull())) + EXPECT_CALL(signal_strategy_, SendStanzaPtr(NotNull())) .WillOnce(DoAll(SaveArg<0>(&sent_iq), Return(true))); heartbeat_sender_->OnSignalStrategyStateChange(SignalStrategy::CONNECTED); @@ -148,7 +148,7 @@ TEST_F(HeartbeatSenderTest, DoSendStanzaWithExpectedSequenceId) { .WillRepeatedly(Return(kTestJid)); EXPECT_CALL(signal_strategy_, GetNextId()) .WillOnce(Return(kStanzaId)); - EXPECT_CALL(signal_strategy_, SendStanza(NotNull())) + EXPECT_CALL(signal_strategy_, SendStanzaPtr(NotNull())) .WillOnce(DoAll(SaveArg<0>(&sent_iq), Return(true))); heartbeat_sender_->OnSignalStrategyStateChange(SignalStrategy::CONNECTED); @@ -163,7 +163,7 @@ TEST_F(HeartbeatSenderTest, DoSendStanzaWithExpectedSequenceId) { .WillRepeatedly(Return(kTestJid)); EXPECT_CALL(signal_strategy_, GetNextId()) .WillOnce(Return(kStanzaId + 1)); - EXPECT_CALL(signal_strategy_, SendStanza(NotNull())) + EXPECT_CALL(signal_strategy_, SendStanzaPtr(NotNull())) .WillOnce(DoAll(SaveArg<0>(&sent_iq2), Return(true))); scoped_ptr<XmlElement> response(new XmlElement(buzz::QN_IQ)); |