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

net/url_request/url_request_test_util.cc

 // 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.
 
 #include "net/url_request/url_request_test_util.h"
 
 #include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/location.h"
@@ skipping 35 matching lines @@
 const int kStageCompletedSuccess = 1 << 7;
 const int kStageCompletedError = 1 << 8;
 const int kStageURLRequestDestroyed = 1 << 9;
 const int kStageDestruction = 1 << 10;
 
 }  // namespace
 
 TestURLRequestContext::TestURLRequestContext()
     : initialized_(false),
       client_socket_factory_(NULL),
+      proxy_delegate_(NULL),
       context_storage_(this) {
   Init();
 }
 
 TestURLRequestContext::TestURLRequestContext(bool delay_initialization)
     : initialized_(false),
       client_socket_factory_(NULL),

[bengr, 2016/02/08 23:23:30]

Suggest changing every NULL to a nullptr.

[RyanSturm, 2016/02/09 00:46:03]

Done.

+      proxy_delegate_(NULL),
       context_storage_(this) {
   if (!delay_initialization)
     Init();
 }
 
 TestURLRequestContext::~TestURLRequestContext() {
   DCHECK(initialized_);
   AssertNoURLRequests();
 }
 
@@ skipping 19 matching lines @@
   }
   if (!http_server_properties()) {
     context_storage_.set_http_server_properties(
         scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl()));
   }
   if (http_transaction_factory()) {
     // Make sure we haven't been passed an object we're not going to use.
     EXPECT_FALSE(client_socket_factory_);
   } else {
     HttpNetworkSession::Params params;
-    if (http_network_session_params_)
+
+    if (http_network_session_params_) {

[bengr, 2016/02/08 23:23:30]

Remove curly braces. Chromium doesn't use them on single line blocks.

[RyanSturm, 2016/02/09 00:46:03]

Done.

       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();
     params.proxy_service = proxy_service();
     params.ssl_config_service = ssl_config_service();
     params.http_auth_handler_factory = http_auth_handler_factory();
     params.network_delegate = network_delegate();
     params.http_server_properties = http_server_properties();
     params.net_log = net_log();
     params.channel_id_service = channel_id_service();
@@ skipping 534 matching lines @@
     URLRequest* request,
     NetworkDelegate* network_delegate) const {
   return main_intercept_job_.release();
 }
 
 void TestJobInterceptor::set_main_intercept_job(scoped_ptr<URLRequestJob> job) {
   main_intercept_job_ = std::move(job);
 }
 
 }  // namespace net