Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/browser/net/resolve_proxy_msg_helper_unittest.cc

-// 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.
 
 #include "chrome/browser/net/resolve_proxy_msg_helper.h"
 
 #include "base/waitable_event.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/mock_proxy_resolver.h"
 #include "net/proxy/proxy_config_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 36 matching lines @@
   }
 
  private:
   scoped_ptr<PendingResult> pending_result_;
 };
 
 // Issue three sequential requests -- each should succeed.
 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);
 
   GURL url1("http://www.google1.com/");
   GURL url2("http://www.google2.com/");
   GURL url3("http://www.google3.com/");
 
   scoped_ptr<IPC::Message> msg1(new IPC::Message());
   scoped_ptr<IPC::Message> msg2(new IPC::Message());
@@ skipping 42 matching lines @@
   EXPECT_EQ(msg3.get(), delegate.pending_result()->msg);
   EXPECT_EQ(net::OK, delegate.pending_result()->error_code);
   EXPECT_EQ("PROXY result3:80", delegate.pending_result()->proxy_list);
   delegate.clear_pending_result();
 }
 
 // Issue a request while one is already in progress -- should be queued.
 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);
 
   GURL url1("http://www.google1.com/");
   GURL url2("http://www.google2.com/");
   GURL url3("http://www.google3.com/");
 
   scoped_ptr<IPC::Message> msg1(new IPC::Message());
   scoped_ptr<IPC::Message> msg2(new IPC::Message());
@@ skipping 46 matching lines @@
   EXPECT_EQ(msg3.get(), delegate.pending_result()->msg);
   EXPECT_EQ(net::OK, delegate.pending_result()->error_code);
   EXPECT_EQ("PROXY result3:80", delegate.pending_result()->proxy_list);
   delegate.clear_pending_result();
 }
 
 // Delete the helper while a request is in progress, and others are pending.
 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(
       new ResolveProxyMsgHelper(&delegate, service));
 
   GURL url1("http://www.google1.com/");
   GURL url2("http://www.google2.com/");
   GURL url3("http://www.google3.com/");
 
   // NOTE: these are not scoped ptr, since they will be deleted by the
@@ skipping 24 matching lines @@
 
   // The pending requests sent to the proxy resolver should have been cancelled.
 
   EXPECT_EQ(0u, resolver->pending_requests().size());
 
   EXPECT_TRUE(delegate.pending_result() == NULL);
 
   // It should also be the case that msg1, msg2, msg3 were deleted by the
   // cancellation. (Else will show up as a leak in Purify/Valgrind).
 }