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

Side by Side Diff: ios/crnet/crnet_environment.mm

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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ios/crnet/crnet_environment.h" 5 #include "ios/crnet/crnet_environment.h"
6 6
7 #import <Foundation/Foundation.h> 7 #import <Foundation/Foundation.h>
8 8
9 #include "base/at_exit.h" 9 #include "base/at_exit.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 params.transport_security_state = main_context_->transport_security_state(); 424 params.transport_security_state = main_context_->transport_security_state();
425 params.proxy_service = main_context_->proxy_service(); 425 params.proxy_service = main_context_->proxy_service();
426 params.ssl_session_cache_shard = ""; 426 params.ssl_session_cache_shard = "";
427 params.ssl_config_service = main_context_->ssl_config_service(); 427 params.ssl_config_service = main_context_->ssl_config_service();
428 params.http_auth_handler_factory = main_context_->http_auth_handler_factory(); 428 params.http_auth_handler_factory = main_context_->http_auth_handler_factory();
429 params.network_delegate = main_context_->network_delegate(); 429 params.network_delegate = main_context_->network_delegate();
430 params.http_server_properties = main_context_->http_server_properties(); 430 params.http_server_properties = main_context_->http_server_properties();
431 params.net_log = main_context_->net_log(); 431 params.net_log = main_context_->net_log();
432 params.next_protos = 432 params.next_protos =
433 net::NextProtosWithSpdyAndQuic(spdy_enabled(), quic_enabled()); 433 net::NextProtosWithSpdyAndQuic(spdy_enabled(), quic_enabled());
434 params.use_alternate_protocols = true; 434 params.use_alternative_services = true;
435 params.enable_quic = quic_enabled(); 435 params.enable_quic = quic_enabled();
436 params.alternative_service_probability_threshold = 436 params.alternative_service_probability_threshold =
437 alternate_protocol_threshold_; 437 alternate_protocol_threshold_;
438 438
439 if (!params.channel_id_service) { 439 if (!params.channel_id_service) {
440 // The main context may not have a ChannelIDService, since it is lazily 440 // The main context may not have a ChannelIDService, since it is lazily
441 // constructed. If not, build an ephemeral ChannelIDService with no backing 441 // constructed. If not, build an ephemeral ChannelIDService with no backing
442 // disk store. 442 // disk store.
443 // TODO(ellyjones): support persisting ChannelID. 443 // TODO(ellyjones): support persisting ChannelID.
444 params.channel_id_service = new net::ChannelIDService( 444 params.channel_id_service = new net::ChannelIDService(
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 if (backend) 494 if (backend)
495 backend->DoomAllEntries(client_callback); 495 backend->DoomAllEntries(client_callback);
496 }); 496 });
497 int rc = cache->GetBackend(&backend, doom_callback); 497 int rc = cache->GetBackend(&backend, doom_callback);
498 if (rc != net::ERR_IO_PENDING) { 498 if (rc != net::ERR_IO_PENDING) {
499 // GetBackend doesn't call the callback if it completes synchronously, so 499 // GetBackend doesn't call the callback if it completes synchronously, so
500 // call it directly here. 500 // call it directly here.
501 doom_callback.Run(rc); 501 doom_callback.Run(rc);
502 } 502 }
503 } 503 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698