Massively simplify the NetworkChangeNotifier infrastructure:...

net/socket/ssl_test_util.cc

 // Copyright (c) 2010 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 "net/socket/ssl_test_util.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 211 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;
-  scoped_refptr<net::HostResolver> resolver(
-      net::CreateSystemHostResolver(NULL));
+  scoped_refptr<net::HostResolver> resolver(net::CreateSystemHostResolver());
   net::HostResolver::RequestInfo info(host_name, port);
   int rv = resolver->Resolve(info, &addr, NULL, NULL, BoundNetLog());
   if (rv != net::OK)
     return false;
 
   net::TCPPinger pinger(addr);
   rv = pinger.Ping(base::TimeDelta::FromMilliseconds(connection_timeout_),
                    connection_attempts_);
   return rv == net::OK;
 }
@@ skipping 118 matching lines @@
                            base::ProcessHandle* process_handle,
                            ScopedHandle* job_handle) {
   // Launch test server process.
   STARTUPINFO startup_info = {0};
   startup_info.cb = sizeof(startup_info);
   startup_info.dwFlags = STARTF_USESHOWWINDOW;
   startup_info.wShowWindow = start_hidden ? SW_HIDE : SW_SHOW;
   PROCESS_INFORMATION process_info;
 
   // If this code is run under a debugger, the test server process is
-  // automatically associated with a job object created by the debugger. 
+  // automatically associated with a job object created by the debugger.
   // The CREATE_BREAKAWAY_FROM_JOB flag is used to prevent this.
   if (!CreateProcess(NULL,
                      const_cast<wchar_t*>(cmdline.c_str()), NULL, NULL,
                      FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL,
                      &startup_info, &process_info)) {
     LOG(ERROR) << "Could not create process.";
     return false;
   }
   CloseHandle(process_info.hThread);
 
@@ skipping 22 matching lines @@
                                       process_info.hProcess)) {
       LOG(ERROR) << "Could not AssignProcessToObject.";
       return false;
     }
   }
   return true;
 }
 #endif
 
 }  // namespace net