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

1 files changed, 2 insertions, 8 deletions

diff --git a/net/base/mock_host_resolver.cc b/net/base/mock_host_resolver.cc
index f822bde..3cc4a82 100644
--- a/net/base/mock_host_resolver.cc
+++ b/net/base/mock_host_resolver.cc
@@ -11,7 +11,6 @@
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/sys_addrinfo.h"
-#include "net/base/test_completion_callback.h"
 
 namespace net {
 
@@ -101,13 +100,8 @@ int MockHostResolverBase::Resolve(const RequestInfo& info,
                                   RequestHandle* out_req,
                                   const BoundNetLog& net_log) {
   if (synchronous_mode_) {
-    TestCompletionCallback sync_callback;
-    int rv = impl_->Resolve(info, addresses, &sync_callback, out_req, net_log);
-    if (rv == ERR_IO_PENDING) {
-      MessageLoop::ScopedNestableTaskAllower nestable(MessageLoop::current());
-      return sync_callback.WaitForResult();
-    }
-    return rv;
+    callback = NULL;
+    out_req = NULL;
   }
   return impl_->Resolve(info, addresses, callback, out_req, net_log);
 }