Moving proxy resolution logic out of NetworkDelegate and into ProxyDelegate for DataReductionProxy

net/url_request/url_request_test_util.h

Index: net/url_request/url_request_test_util.h
diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h
index 1a829d5c12cf3e2b47c5ca48c17c50b188cb5ca3..27fa9fcff8cf6e2c40d2fd59668e71d2d7a9ac18 100644
--- a/net/url_request/url_request_test_util.h
+++ b/net/url_request/url_request_test_util.h
@@ -62,40 +62,48 @@ class TestURLRequestContext : public URLRequestContext {
 
   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: