diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 03:45:11 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 03:45:11 +0000 |
| commit | 02f2de67ceeb9851a87391ef2a00a30661e20bc2 (patch) | |
| tree | 38fc92fa13871147eef5cbf32ca9a416cf098f38 /remoting/host | |
| parent | bd82b02d2fb756c0e589ac7cf28cbdec1c39ba63 (diff) | |
| download | chromium_src-02f2de67ceeb9851a87391ef2a00a30661e20bc2.zip chromium_src-02f2de67ceeb9851a87391ef2a00a30661e20bc2.tar.gz chromium_src-02f2de67ceeb9851a87391ef2a00a30661e20bc2.tar.bz2 | |
Fix leaks from a unit test added in r111239.
R=sergeyu
CC=chromoting,dhollowa
Review URL: http://codereview.chromium.org/8669007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/log_to_server_unittest.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/remoting/host/log_to_server_unittest.cc b/remoting/host/log_to_server_unittest.cc index 768abc4..0667fd1 100644 --- a/remoting/host/log_to_server_unittest.cc +++ b/remoting/host/log_to_server_unittest.cc @@ -9,9 +9,12 @@ #include "testing/gmock_mutant.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/libjingle/source/talk/xmllite/xmlelement.h" using testing::_; +using testing::DeleteArg; using testing::InSequence; +using testing::Return; namespace remoting { @@ -43,7 +46,8 @@ TEST_F(LogToServerTest, SendNow) { InSequence s; EXPECT_CALL(signal_strategy_, AddListener(_)); EXPECT_CALL(signal_strategy_, GetNextId()); - EXPECT_CALL(signal_strategy_, SendStanza(_)); + EXPECT_CALL(signal_strategy_, SendStanza(_)) + .WillOnce(DoAll(DeleteArg<0>(), Return(true))); EXPECT_CALL(signal_strategy_, RemoveListener(_)) .WillOnce(QuitMainMessageLoop(&message_loop_)) .RetiresOnSaturation(); @@ -60,7 +64,8 @@ TEST_F(LogToServerTest, SendLater) { InSequence s; EXPECT_CALL(signal_strategy_, AddListener(_)); EXPECT_CALL(signal_strategy_, GetNextId()); - EXPECT_CALL(signal_strategy_, SendStanza(_)); + EXPECT_CALL(signal_strategy_, SendStanza(_)) + .WillOnce(DoAll(DeleteArg<0>(), Return(true))); EXPECT_CALL(signal_strategy_, RemoveListener(_)) .WillOnce(QuitMainMessageLoop(&message_loop_)) .RetiresOnSaturation(); @@ -77,7 +82,8 @@ TEST_F(LogToServerTest, SendTwoEntriesLater) { InSequence s; EXPECT_CALL(signal_strategy_, AddListener(_)); EXPECT_CALL(signal_strategy_, GetNextId()); - EXPECT_CALL(signal_strategy_, SendStanza(_)); + EXPECT_CALL(signal_strategy_, SendStanza(_)) + .WillOnce(DoAll(DeleteArg<0>(), Return(true))); EXPECT_CALL(signal_strategy_, RemoveListener(_)) .WillOnce(QuitMainMessageLoop(&message_loop_)) .RetiresOnSaturation(); |