summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-07 23:39:08 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-07 23:39:08 +0000
commit31d1394965e2ccfd940ace6cc705b9456de6e534 (patch)
tree282958e93c626d0fddf42e0664f9c26818a07b81 /chrome
parentf07816929a0d65d2863db2093c7522da2b272a7a (diff)
downloadchromium_src-31d1394965e2ccfd940ace6cc705b9456de6e534.zip
chromium_src-31d1394965e2ccfd940ace6cc705b9456de6e534.tar.gz
chromium_src-31d1394965e2ccfd940ace6cc705b9456de6e534.tar.bz2
TBR: chron@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43895 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/sync/notifier/listener/talk_mediator_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/sync/notifier/listener/talk_mediator_unittest.cc b/chrome/browser/sync/notifier/listener/talk_mediator_unittest.cc
index 0a3b057..6beff1f 100644
--- a/chrome/browser/sync/notifier/listener/talk_mediator_unittest.cc
+++ b/chrome/browser/sync/notifier/listener/talk_mediator_unittest.cc
@@ -123,16 +123,16 @@ TEST_F(TalkMediatorImplTest, SendNotification) {
talk1->OnSubscriptionSuccess();
ASSERT_TRUE(talk1->state_.subscribed == 1);
ASSERT_TRUE(talk1->SendNotification() == true);
- ASSERT_TRUE(mock->send_calls == 1);
- ASSERT_TRUE(talk1->SendNotification() == true);
ASSERT_TRUE(mock->send_calls == 2);
+ ASSERT_TRUE(talk1->SendNotification() == true);
+ ASSERT_TRUE(mock->send_calls == 3);
ASSERT_TRUE(talk1->Logout() == true);
ASSERT_TRUE(mock->logout_calls == 1);
// Failure due to being logged out.
ASSERT_TRUE(talk1->SendNotification() == false);
- ASSERT_TRUE(mock->send_calls == 2);
+ ASSERT_TRUE(mock->send_calls == 3);
}
TEST_F(TalkMediatorImplTest, MediatorThreadCallbacks) {
@@ -162,7 +162,7 @@ TEST_F(TalkMediatorImplTest, MediatorThreadCallbacks) {
// After subscription success is receieved, the talk mediator will allow
// sending of notifications.
ASSERT_TRUE(talk1->SendNotification() == true);
- ASSERT_TRUE(mock->send_calls == 1);
+ ASSERT_TRUE(mock->send_calls == 2);
// |MSG_NOTIFICATION_RECEIVED| from the MediatorThread triggers a callback
// of type |NOTIFICATION_RECEIVED|.