Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Side by Side Diff: net/url_request/url_request_test_util.cc

Issue 1811283004: Remove NetworkDelegate from HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Response to comments Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/url_request/url_request_context_builder.cc ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/url_request/url_request_test_util.h" 5 #include "net/url_request/url_request_test_util.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 params.proxy_delegate = proxy_delegate(); 104 params.proxy_delegate = proxy_delegate();
105 params.host_resolver = host_resolver(); 105 params.host_resolver = host_resolver();
106 params.cert_verifier = cert_verifier(); 106 params.cert_verifier = cert_verifier();
107 params.cert_transparency_verifier = cert_transparency_verifier(); 107 params.cert_transparency_verifier = cert_transparency_verifier();
108 if (ct_policy_enforcer()) 108 if (ct_policy_enforcer())
109 params.ct_policy_enforcer = ct_policy_enforcer(); 109 params.ct_policy_enforcer = ct_policy_enforcer();
110 params.transport_security_state = transport_security_state(); 110 params.transport_security_state = transport_security_state();
111 params.proxy_service = proxy_service(); 111 params.proxy_service = proxy_service();
112 params.ssl_config_service = ssl_config_service(); 112 params.ssl_config_service = ssl_config_service();
113 params.http_auth_handler_factory = http_auth_handler_factory(); 113 params.http_auth_handler_factory = http_auth_handler_factory();
114 params.network_delegate = network_delegate();
115 params.http_server_properties = http_server_properties(); 114 params.http_server_properties = http_server_properties();
116 params.net_log = net_log(); 115 params.net_log = net_log();
117 params.channel_id_service = channel_id_service(); 116 params.channel_id_service = channel_id_service();
118 context_storage_.set_http_network_session( 117 context_storage_.set_http_network_session(
119 make_scoped_ptr(new HttpNetworkSession(params))); 118 make_scoped_ptr(new HttpNetworkSession(params)));
120 context_storage_.set_http_transaction_factory(make_scoped_ptr( 119 context_storage_.set_http_transaction_factory(make_scoped_ptr(
121 new HttpCache(context_storage_.http_network_session(), 120 new HttpCache(context_storage_.http_network_session(),
122 HttpCache::DefaultBackend::InMemory(0), false))); 121 HttpCache::DefaultBackend::InMemory(0), false)));
123 } 122 }
124 // In-memory cookie store. 123 // In-memory cookie store.
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 URLRequest* request, 653 URLRequest* request,
655 NetworkDelegate* network_delegate) const { 654 NetworkDelegate* network_delegate) const {
656 return main_intercept_job_.release(); 655 return main_intercept_job_.release();
657 } 656 }
658 657
659 void TestJobInterceptor::set_main_intercept_job(scoped_ptr<URLRequestJob> job) { 658 void TestJobInterceptor::set_main_intercept_job(scoped_ptr<URLRequestJob> job) {
660 main_intercept_job_ = std::move(job); 659 main_intercept_job_ = std::move(job);
661 } 660 }
662 661
663 } // namespace net 662 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_context_builder.cc ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698