Massively simplify the NetworkChangeNotifier infrastructure:...

net/socket/tcp_pinger_unittest.cc

-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// 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 "base/ref_counted.h"
 #include "base/trace_event.h"
 #include "net/base/address_list.h"
 #include "net/base/host_resolver.h"
 #include "net/base/listen_socket.h"
 #include "net/base/net_errors.h"
 #include "net/base/winsock_init.h"
@@ skipping 46 matching lines @@
 #endif
   for (listen_port_ = kMinPort; listen_port_ < kMaxPort; listen_port_++) {
     listen_sock_ = ListenSocket::Listen("127.0.0.1", listen_port_, this);
     if (listen_sock_.get()) break;
   }
   ASSERT_TRUE(listen_sock_.get() != NULL);
 }
 
 TEST_F(TCPPingerTest, Ping) {
   net::AddressList addr;
-  scoped_refptr<net::HostResolver> resolver(
-      net::CreateSystemHostResolver(NULL));
+  scoped_refptr<net::HostResolver> resolver(net::CreateSystemHostResolver());
 
   net::HostResolver::RequestInfo info("localhost", listen_port_);
   int rv = resolver->Resolve(info, &addr, NULL, NULL, net::BoundNetLog());
   EXPECT_EQ(rv, net::OK);
 
   net::TCPPinger pinger(addr);
   rv = pinger.Ping();
   EXPECT_EQ(rv, net::OK);
 }
 
 TEST_F(TCPPingerTest, PingFail) {
   net::AddressList addr;
-  scoped_refptr<net::HostResolver> resolver(
-      net::CreateSystemHostResolver(NULL));
+  scoped_refptr<net::HostResolver> resolver(net::CreateSystemHostResolver());
 
   // "Kill" "server"
   listen_sock_ = NULL;
 
   net::HostResolver::RequestInfo info("localhost", listen_port_);
   int rv = resolver->Resolve(info, &addr, NULL, NULL, net::BoundNetLog());
   EXPECT_EQ(rv, net::OK);
 
   net::TCPPinger pinger(addr);
   rv = pinger.Ping(base::TimeDelta::FromMilliseconds(100), 1);
   EXPECT_NE(rv, net::OK);
 }