Revert of Moving proxy resolution logic out of NetworkDelegate and into ProxyDelegate

net/url_request/url_request_test_util.cc

Index: net/url_request/url_request_test_util.cc
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index 34e1f0bc715acc63e63cec630e4c2e646b3b34f9..60f0f36c8b73fb273257b8ad4fbd52387ad47656 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -52,16 +52,14 @@
 
 TestURLRequestContext::TestURLRequestContext()
     : initialized_(false),
-      client_socket_factory_(nullptr),
-      proxy_delegate_(nullptr),
+      client_socket_factory_(NULL),
       context_storage_(this) {
   Init();
 }
 
 TestURLRequestContext::TestURLRequestContext(bool delay_initialization)
     : initialized_(false),
-      client_socket_factory_(nullptr),
-      proxy_delegate_(nullptr),
+      client_socket_factory_(NULL),
       context_storage_(this) {
   if (!delay_initialization)
     Init();
@@ -101,11 +99,9 @@
     EXPECT_FALSE(client_socket_factory_);
   } else {
     HttpNetworkSession::Params params;
-
     if (http_network_session_params_)
       params = *http_network_session_params_;
     params.client_socket_factory = client_socket_factory();
-    params.proxy_delegate = proxy_delegate();
     params.host_resolver = host_resolver();
     params.cert_verifier = cert_verifier();
     params.transport_security_state = transport_security_state();
@@ -124,11 +120,11 @@
   }
   // In-memory cookie store.
   if (!cookie_store())
-    context_storage_.set_cookie_store(new CookieMonster(nullptr, nullptr));
+    context_storage_.set_cookie_store(new CookieMonster(NULL, NULL));
   // In-memory Channel ID service.
   if (!channel_id_service()) {
     context_storage_.set_channel_id_service(make_scoped_ptr(
-        new ChannelIDService(new DefaultChannelIDStore(nullptr),
+        new ChannelIDService(new DefaultChannelIDStore(NULL),
                              base::WorkerPool::GetTaskRunner(true))));
   }
   if (!http_user_agent_settings()) {