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

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

Issue 2906463002: Make HttpNetworkSession::host_mapping_rules no longer a pointer. (Closed)
Patch Set: More upstream merge conflicts! Fun! Created 3 years, 6 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.h ('k') | no next file » | 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_context_builder.h" 5 #include "net/url_request/url_request_context_builder.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 }; 185 };
186 186
187 } // namespace 187 } // namespace
188 188
189 URLRequestContextBuilder::HttpCacheParams::HttpCacheParams() 189 URLRequestContextBuilder::HttpCacheParams::HttpCacheParams()
190 : type(IN_MEMORY), 190 : type(IN_MEMORY),
191 max_size(0) {} 191 max_size(0) {}
192 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {} 192 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {}
193 193
194 URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams() 194 URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams()
195 : host_mapping_rules(nullptr), 195 : ignore_certificate_errors(false),
196 ignore_certificate_errors(false),
197 testing_fixed_http_port(0), 196 testing_fixed_http_port(0),
198 testing_fixed_https_port(0), 197 testing_fixed_https_port(0),
199 enable_http2(true), 198 enable_http2(true),
200 enable_quic(false), 199 enable_quic(false),
201 quic_max_server_configs_stored_in_properties(0), 200 quic_max_server_configs_stored_in_properties(0),
202 quic_close_sessions_on_ip_change(false), 201 quic_close_sessions_on_ip_change(false),
203 quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds), 202 quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds),
204 quic_migrate_sessions_on_network_change(false), 203 quic_migrate_sessions_on_network_change(false),
205 quic_migrate_sessions_early(false), 204 quic_migrate_sessions_early(false),
206 quic_disable_bidirectional_streams(false), 205 quic_disable_bidirectional_streams(false),
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 std::unique_ptr<ProxyConfigService> proxy_config_service, 539 std::unique_ptr<ProxyConfigService> proxy_config_service,
541 URLRequestContext* url_request_context, 540 URLRequestContext* url_request_context,
542 HostResolver* host_resolver, 541 HostResolver* host_resolver,
543 NetworkDelegate* network_delegate, 542 NetworkDelegate* network_delegate,
544 NetLog* net_log) { 543 NetLog* net_log) {
545 return ProxyService::CreateUsingSystemProxyResolver( 544 return ProxyService::CreateUsingSystemProxyResolver(
546 std::move(proxy_config_service), net_log); 545 std::move(proxy_config_service), net_log);
547 } 546 }
548 547
549 } // namespace net 548 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_context_builder.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698