summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authoragayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 01:56:32 +0000
committeragayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 01:56:32 +0000
commit076632b6a10f2adaeb8cd2faa6f2b9625fc18479 (patch)
tree8ff6ca0f76f8be2b47bbc70bf223fc6071940092 /jingle
parent4d280fadfff3d038dd4ca07c7de2879a274a5611 (diff)
downloadchromium_src-076632b6a10f2adaeb8cd2faa6f2b9625fc18479.zip
chromium_src-076632b6a10f2adaeb8cd2faa6f2b9625fc18479.tar.gz
chromium_src-076632b6a10f2adaeb8cd2faa6f2b9625fc18479.tar.bz2
HostResolverImpl: don't interpret NULL callback argument as a request to do synchronous resolution.
BUG=90547,60149 TEST=net_unittests --gtest_filter="HostResolverImplTest*" Review URL: http://codereview.chromium.org/7465046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94412 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-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(