summaryrefslogtreecommitdiffstats
path: root/jingle/notifier
diff options
context:
space:
mode:
authoragayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 21:34:47 +0000
committeragayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 21:34:47 +0000
commit6e78dfb46a07e5ee38225e0cd32fa8b70ed41558 (patch)
treec00c45283a8b8f86eb079395ee4ba56c9954c215 /jingle/notifier
parenta13cc36d904c699cd37f80a1c5200f21a7a54671 (diff)
downloadchromium_src-6e78dfb46a07e5ee38225e0cd32fa8b70ed41558.zip
chromium_src-6e78dfb46a07e5ee38225e0cd32fa8b70ed41558.tar.gz
chromium_src-6e78dfb46a07e5ee38225e0cd32fa8b70ed41558.tar.bz2
HostResolverImpl: don't interpret NULL callback argument as a request to do synchronous resolution.
BUG=90547,60149 TEST=net_unittests Review URL: http://codereview.chromium.org/7520026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94552 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/notifier')
-rw-r--r--jingle/notifier/communicator/xmpp_connection_generator_unittest.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/jingle/notifier/communicator/xmpp_connection_generator_unittest.cc b/jingle/notifier/communicator/xmpp_connection_generator_unittest.cc
index daa421f..04da3df 100644
--- a/jingle/notifier/communicator/xmpp_connection_generator_unittest.cc
+++ b/jingle/notifier/communicator/xmpp_connection_generator_unittest.cc
@@ -65,6 +65,8 @@ TEST_F(XmppConnectionGeneratorTest, DnsFailure) {
}
TEST_F(XmppConnectionGeneratorTest, DnsFailureSynchronous) {
+ MessageLoop message_loop;
+
EXPECT_CALL(delegate_, OnNewSettings(_)).Times(0);
EXPECT_CALL(delegate_, OnExhaustedSettings(_, _)).Times(1);
@@ -90,6 +92,8 @@ TEST_F(XmppConnectionGeneratorTest, ConnectionFailure) {
}
TEST_F(XmppConnectionGeneratorTest, ConnectionFailureSynchronous) {
+ MessageLoop message_loop;
+
EXPECT_CALL(delegate_, OnNewSettings(_)).
Times(5).
WillRepeatedly(