summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authoragayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 02:20:06 +0000
committeragayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 02:20:06 +0000
commit10b71b546ae4ce616bd2a26c5fcadfdfcddf4e3f (patch)
treedcb6c2c826253b016e477c7466da3ca0d4982160 /jingle
parent0be241219a6cecb753ae4fdfb049f75530353771 (diff)
downloadchromium_src-10b71b546ae4ce616bd2a26c5fcadfdfcddf4e3f.zip
chromium_src-10b71b546ae4ce616bd2a26c5fcadfdfcddf4e3f.tar.gz
chromium_src-10b71b546ae4ce616bd2a26c5fcadfdfcddf4e3f.tar.bz2
Revert 94412 - 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 TBR=agayev@chromium.org Review URL: http://codereview.chromium.org/7524018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r--jingle/notifier/communicator/xmpp_connection_generator_unittest.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/jingle/notifier/communicator/xmpp_connection_generator_unittest.cc b/jingle/notifier/communicator/xmpp_connection_generator_unittest.cc
index 04da3df..daa421f 100644
--- a/jingle/notifier/communicator/xmpp_connection_generator_unittest.cc
+++ b/jingle/notifier/communicator/xmpp_connection_generator_unittest.cc
@@ -65,8 +65,6 @@ TEST_F(XmppConnectionGeneratorTest, DnsFailure) {
}
TEST_F(XmppConnectionGeneratorTest, DnsFailureSynchronous) {
- MessageLoop message_loop;
-
EXPECT_CALL(delegate_, OnNewSettings(_)).Times(0);
EXPECT_CALL(delegate_, OnExhaustedSettings(_, _)).Times(1);
@@ -92,8 +90,6 @@ TEST_F(XmppConnectionGeneratorTest, ConnectionFailure) {
}
TEST_F(XmppConnectionGeneratorTest, ConnectionFailureSynchronous) {
- MessageLoop message_loop;
-
EXPECT_CALL(delegate_, OnNewSettings(_)).
Times(5).
WillRepeatedly(