Commit 02f2de67 authored by dhollowa@chromium.org's avatar dhollowa@chromium.org

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
parent bd82b02d
...@@ -9,9 +9,12 @@ ...@@ -9,9 +9,12 @@
#include "testing/gmock_mutant.h" #include "testing/gmock_mutant.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
using testing::_; using testing::_;
using testing::DeleteArg;
using testing::InSequence; using testing::InSequence;
using testing::Return;
namespace remoting { namespace remoting {
...@@ -43,7 +46,8 @@ TEST_F(LogToServerTest, SendNow) { ...@@ -43,7 +46,8 @@ TEST_F(LogToServerTest, SendNow) {
InSequence s; InSequence s;
EXPECT_CALL(signal_strategy_, AddListener(_)); EXPECT_CALL(signal_strategy_, AddListener(_));
EXPECT_CALL(signal_strategy_, GetNextId()); 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(_)) EXPECT_CALL(signal_strategy_, RemoveListener(_))
.WillOnce(QuitMainMessageLoop(&message_loop_)) .WillOnce(QuitMainMessageLoop(&message_loop_))
.RetiresOnSaturation(); .RetiresOnSaturation();
...@@ -60,7 +64,8 @@ TEST_F(LogToServerTest, SendLater) { ...@@ -60,7 +64,8 @@ TEST_F(LogToServerTest, SendLater) {
InSequence s; InSequence s;
EXPECT_CALL(signal_strategy_, AddListener(_)); EXPECT_CALL(signal_strategy_, AddListener(_));
EXPECT_CALL(signal_strategy_, GetNextId()); 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(_)) EXPECT_CALL(signal_strategy_, RemoveListener(_))
.WillOnce(QuitMainMessageLoop(&message_loop_)) .WillOnce(QuitMainMessageLoop(&message_loop_))
.RetiresOnSaturation(); .RetiresOnSaturation();
...@@ -77,7 +82,8 @@ TEST_F(LogToServerTest, SendTwoEntriesLater) { ...@@ -77,7 +82,8 @@ TEST_F(LogToServerTest, SendTwoEntriesLater) {
InSequence s; InSequence s;
EXPECT_CALL(signal_strategy_, AddListener(_)); EXPECT_CALL(signal_strategy_, AddListener(_));
EXPECT_CALL(signal_strategy_, GetNextId()); 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(_)) EXPECT_CALL(signal_strategy_, RemoveListener(_))
.WillOnce(QuitMainMessageLoop(&message_loop_)) .WillOnce(QuitMainMessageLoop(&message_loop_))
.RetiresOnSaturation(); .RetiresOnSaturation();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment