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

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: 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
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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 : type(IN_MEMORY), 172 : type(IN_MEMORY),
173 max_size(0) {} 173 max_size(0) {}
174 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {} 174 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {}
175 175
176 URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams() 176 URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams()
177 : ignore_certificate_errors(false), 177 : ignore_certificate_errors(false),
178 host_mapping_rules(NULL), 178 host_mapping_rules(NULL),
179 testing_fixed_http_port(0), 179 testing_fixed_http_port(0),
180 testing_fixed_https_port(0), 180 testing_fixed_https_port(0),
181 next_protos(NextProtosDefaults()), 181 next_protos(NextProtosDefaults()),
182 use_alternate_protocols(true), 182 use_alternative_services(true),
183 enable_quic(false), 183 enable_quic(false),
184 enable_insecure_quic(false) {} 184 enable_insecure_quic(false) {}
185 185
186 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams() 186 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
187 {} 187 {}
188 188
189 URLRequestContextBuilder::SchemeFactory::SchemeFactory( 189 URLRequestContextBuilder::SchemeFactory::SchemeFactory(
190 const std::string& auth_scheme, 190 const std::string& auth_scheme,
191 HttpAuthHandlerFactory* auth_handler_factory) 191 HttpAuthHandlerFactory* auth_handler_factory)
192 : scheme(auth_scheme), factory(auth_handler_factory) { 192 : scheme(auth_scheme), factory(auth_handler_factory) {
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 network_session_params.net_log = context->net_log(); 365 network_session_params.net_log = context->net_log();
366 366
367 network_session_params.ignore_certificate_errors = 367 network_session_params.ignore_certificate_errors =
368 http_network_session_params_.ignore_certificate_errors; 368 http_network_session_params_.ignore_certificate_errors;
369 network_session_params.host_mapping_rules = 369 network_session_params.host_mapping_rules =
370 http_network_session_params_.host_mapping_rules; 370 http_network_session_params_.host_mapping_rules;
371 network_session_params.testing_fixed_http_port = 371 network_session_params.testing_fixed_http_port =
372 http_network_session_params_.testing_fixed_http_port; 372 http_network_session_params_.testing_fixed_http_port;
373 network_session_params.testing_fixed_https_port = 373 network_session_params.testing_fixed_https_port =
374 http_network_session_params_.testing_fixed_https_port; 374 http_network_session_params_.testing_fixed_https_port;
375 network_session_params.use_alternate_protocols = 375 network_session_params.use_alternative_services =
376 http_network_session_params_.use_alternate_protocols; 376 http_network_session_params_.use_alternative_services;
377 network_session_params.trusted_spdy_proxy = 377 network_session_params.trusted_spdy_proxy =
378 http_network_session_params_.trusted_spdy_proxy; 378 http_network_session_params_.trusted_spdy_proxy;
379 network_session_params.next_protos = http_network_session_params_.next_protos; 379 network_session_params.next_protos = http_network_session_params_.next_protos;
380 network_session_params.enable_quic = http_network_session_params_.enable_quic; 380 network_session_params.enable_quic = http_network_session_params_.enable_quic;
381 network_session_params.enable_insecure_quic = 381 network_session_params.enable_insecure_quic =
382 http_network_session_params_.enable_insecure_quic; 382 http_network_session_params_.enable_insecure_quic;
383 network_session_params.quic_connection_options = 383 network_session_params.quic_connection_options =
384 http_network_session_params_.quic_connection_options; 384 http_network_session_params_.quic_connection_options;
385 385
386 HttpTransactionFactory* http_transaction_factory = NULL; 386 HttpTransactionFactory* http_transaction_factory = NULL;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 } 439 }
440 url_request_interceptors_.weak_clear(); 440 url_request_interceptors_.weak_clear();
441 } 441 }
442 storage->set_job_factory(top_job_factory.release()); 442 storage->set_job_factory(top_job_factory.release());
443 // TODO(willchan): Support sdch. 443 // TODO(willchan): Support sdch.
444 444
445 return context; 445 return context;
446 } 446 }
447 447
448 } // namespace net 448 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698