Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/net/resolve_proxy_msg_helper_unittest.cc

Index: chrome/browser/net/resolve_proxy_msg_helper_unittest.cc
===================================================================
--- chrome/browser/net/resolve_proxy_msg_helper_unittest.cc	(revision 50775)
+++ chrome/browser/net/resolve_proxy_msg_helper_unittest.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 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.
 
@@ -55,7 +55,7 @@
 TEST(ResolveProxyMsgHelperTest, Sequential) {
   net::MockAsyncProxyResolver* resolver = new net::MockAsyncProxyResolver;
   scoped_refptr<net::ProxyService> service(
-      new net::ProxyService(new MockProxyConfigService, resolver, NULL, NULL));
+      new net::ProxyService(new MockProxyConfigService, resolver, NULL));
 
   MyDelegate delegate;
   ResolveProxyMsgHelper helper(&delegate, service);
@@ -118,7 +118,7 @@
 TEST(ResolveProxyMsgHelperTest, QueueRequests) {
   net::MockAsyncProxyResolver* resolver = new net::MockAsyncProxyResolver;
   scoped_refptr<net::ProxyService> service(
-      new net::ProxyService(new MockProxyConfigService, resolver, NULL, NULL));
+      new net::ProxyService(new MockProxyConfigService, resolver, NULL));
 
   MyDelegate delegate;
   ResolveProxyMsgHelper helper(&delegate, service);
@@ -185,7 +185,7 @@
 TEST(ResolveProxyMsgHelperTest, CancelPendingRequests) {
   net::MockAsyncProxyResolver* resolver = new net::MockAsyncProxyResolver;
   scoped_refptr<net::ProxyService> service(
-      new net::ProxyService(new MockProxyConfigService, resolver, NULL, NULL));
+      new net::ProxyService(new MockProxyConfigService, resolver, NULL));
 
   MyDelegate delegate;
   scoped_ptr<ResolveProxyMsgHelper> helper(