* Move the global "DnsResolutionObserver" code depended on by DNS prefetcher,...

net/base/ssl_test_util.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <algorithm>
 
 #include "net/base/ssl_test_util.h"
 
 #include "build/build_config.h"
@@ skipping 229 matching lines @@
 
   LOG(INFO) << "Started on port " << port_str;
   return true;
 }
 
 bool TestServerLauncher::WaitToStart(const std::string& host_name, int port) {
   // Verify that the webserver is actually started.
   // Otherwise tests can fail if they run faster than Python can start.
   net::AddressList addr;
   net::HostResolver resolver;
-  int rv = resolver.Resolve(host_name, port, &addr, NULL, NULL);
+  net::HostResolver::RequestInfo info(host_name, port);
+  int rv = resolver.Resolve(info, &addr, NULL, NULL);
   if (rv != net::OK)
     return false;
 
   net::TCPPinger pinger(addr);
   rv = pinger.Ping();
   return rv == net::OK;
 }
 
 bool TestServerLauncher::WaitToFinish(int timeout_ms) {
   if (!process_handle_)
@@ skipping 95 matching lines @@
                   "certificate to your trusted roots for this test to work. "
                   "For more info visit:\n"
                   "http://dev.chromium.org/developers/testing\n";
     return false;
   }
 #endif
   return true;
 }
 
 }  // namespace net