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

net/url_request/url_request_test_util.h

 // Copyright (c) 2012 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_TEST_UTIL_H_
 #define NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_
 
 #include <stdint.h>
 #include <stdlib.h>
 #include <map>
@@ skipping 51 matching lines @@
 
   void Init();
 
   ClientSocketFactory* client_socket_factory() {
     return client_socket_factory_;
   }
   void set_client_socket_factory(ClientSocketFactory* factory) {
     client_socket_factory_ = factory;
   }
 
-  ProxyDelegate* proxy_delegate() { return proxy_delegate_; }
-
-  void set_proxy_delegate(ProxyDelegate* proxy_delegate) {
-    proxy_delegate_ = proxy_delegate;
-  }
-
   void set_http_network_session_params(
       scoped_ptr<HttpNetworkSession::Params> params) {
     http_network_session_params_ = std::move(params);
   }
 
   void SetSdchManager(scoped_ptr<SdchManager> sdch_manager) {
     context_storage_.set_sdch_manager(std::move(sdch_manager));
   }
 
  private:
   bool initialized_;
 
   // Optional parameters to override default values.  Note that values that
   // point to other objects the TestURLRequestContext creates will be
   // overwritten.
   scoped_ptr<HttpNetworkSession::Params> http_network_session_params_;
 
   // Not owned:
   ClientSocketFactory* client_socket_factory_;
 
-  ProxyDelegate* proxy_delegate_;
-
  protected:
   URLRequestContextStorage context_storage_;
 };
 
 //-----------------------------------------------------------------------------
 
 // Used to return a dummy context, which lives on the message loop
 // given in the constructor.
 class TestURLRequestContextGetter : public URLRequestContextGetter {
  public:
@@ skipping 302 matching lines @@
       NetworkDelegate* network_delegate) const override;
   void set_main_intercept_job(scoped_ptr<URLRequestJob> job);
 
  private:
   mutable scoped_ptr<URLRequestJob> main_intercept_job_;
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_