Split ProxyResolver into two interfaces:...

net/url_request/url_request_unittest.h

 // 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.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_UNITTEST_H_
 #define NET_URL_REQUEST_URL_REQUEST_UNITTEST_H_
 
 #include <stdlib.h>
 
 #include <sstream>
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "base/time.h"
 #include "base/waitable_event.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_network_layer.h"
 #include "net/url_request/url_request.h"
-#include "net/proxy/proxy_resolver_null.h"
 #include "net/proxy/proxy_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "googleurl/src/url_util.h"
 
 const int kDefaultPort = 1337;
 const std::string kDefaultHostName("localhost");
 
 // This URLRequestContext does not use a local cache.
 class TestURLRequestContext : public URLRequestContext {
  public:
   TestURLRequestContext() {
-    proxy_service_ = new net::ProxyService(new net::ProxyResolverNull);
+    proxy_service_ = net::ProxyService::CreateNull();
     http_transaction_factory_ =
         net::HttpNetworkLayer::CreateFactory(proxy_service_);
   }
 
   virtual ~TestURLRequestContext() {
     delete http_transaction_factory_;
     delete proxy_service_;
   }
 };
 
@@ skipping 390 matching lines @@
                    const std::wstring& document_root,
                    const std::wstring& cert_path) : TestServer(ManualInit()) {
     Init(host_name, port, document_root, cert_path);
   }
 
   virtual std::string scheme() { return std::string("https"); }
 };
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_UNITTEST_H_