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

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

Issue 1268313004: s/use_alternate_protocols/use_alternative_services/g (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re: #15. Created 5 years, 4 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 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 : type(IN_MEMORY), 174 : type(IN_MEMORY),
175 max_size(0) {} 175 max_size(0) {}
176 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {} 176 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {}
177 177
178 URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams() 178 URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams()
179 : ignore_certificate_errors(false), 179 : ignore_certificate_errors(false),
180 host_mapping_rules(NULL), 180 host_mapping_rules(NULL),
181 testing_fixed_http_port(0), 181 testing_fixed_http_port(0),
182 testing_fixed_https_port(0), 182 testing_fixed_https_port(0),
183 next_protos(NextProtosDefaults()), 183 next_protos(NextProtosDefaults()),
184 use_alternate_protocols(true), 184 use_alternative_services(true),
185 enable_quic(false), 185 enable_quic(false),
186 enable_insecure_quic(false) {} 186 enable_insecure_quic(false) {}
187 187
188 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams() 188 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
189 {} 189 {}
190 190
191 URLRequestContextBuilder::SchemeFactory::SchemeFactory( 191 URLRequestContextBuilder::SchemeFactory::SchemeFactory(
192 const std::string& auth_scheme, 192 const std::string& auth_scheme,
193 HttpAuthHandlerFactory* auth_handler_factory) 193 HttpAuthHandlerFactory* auth_handler_factory)
194 : scheme(auth_scheme), factory(auth_handler_factory) { 194 : scheme(auth_scheme), factory(auth_handler_factory) {
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 network_session_params.net_log = context->net_log(); 367 network_session_params.net_log = context->net_log();
368 368
369 network_session_params.ignore_certificate_errors = 369 network_session_params.ignore_certificate_errors =
370 http_network_session_params_.ignore_certificate_errors; 370 http_network_session_params_.ignore_certificate_errors;
371 network_session_params.host_mapping_rules = 371 network_session_params.host_mapping_rules =
372 http_network_session_params_.host_mapping_rules; 372 http_network_session_params_.host_mapping_rules;
373 network_session_params.testing_fixed_http_port = 373 network_session_params.testing_fixed_http_port =
374 http_network_session_params_.testing_fixed_http_port; 374 http_network_session_params_.testing_fixed_http_port;
375 network_session_params.testing_fixed_https_port = 375 network_session_params.testing_fixed_https_port =
376 http_network_session_params_.testing_fixed_https_port; 376 http_network_session_params_.testing_fixed_https_port;
377 network_session_params.use_alternate_protocols = 377 network_session_params.use_alternative_services =
378 http_network_session_params_.use_alternate_protocols; 378 http_network_session_params_.use_alternative_services;
379 network_session_params.trusted_spdy_proxy = 379 network_session_params.trusted_spdy_proxy =
380 http_network_session_params_.trusted_spdy_proxy; 380 http_network_session_params_.trusted_spdy_proxy;
381 network_session_params.next_protos = http_network_session_params_.next_protos; 381 network_session_params.next_protos = http_network_session_params_.next_protos;
382 network_session_params.enable_quic = http_network_session_params_.enable_quic; 382 network_session_params.enable_quic = http_network_session_params_.enable_quic;
383 network_session_params.enable_insecure_quic = 383 network_session_params.enable_insecure_quic =
384 http_network_session_params_.enable_insecure_quic; 384 http_network_session_params_.enable_insecure_quic;
385 network_session_params.quic_connection_options = 385 network_session_params.quic_connection_options =
386 http_network_session_params_.quic_connection_options; 386 http_network_session_params_.quic_connection_options;
387 387
388 HttpTransactionFactory* http_transaction_factory = NULL; 388 HttpTransactionFactory* http_transaction_factory = NULL;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 } 441 }
442 url_request_interceptors_.weak_clear(); 442 url_request_interceptors_.weak_clear();
443 } 443 }
444 storage->set_job_factory(top_job_factory.release()); 444 storage->set_job_factory(top_job_factory.release());
445 // TODO(willchan): Support sdch. 445 // TODO(willchan): Support sdch.
446 446
447 return context; 447 return context;
448 } 448 }
449 449
450 } // namespace net 450 } // 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