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

Side by Side Diff: components/cronet/ios/cronet_environment.cc

Issue 2011983002: Remove |parse_alternative_service| flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 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 | « no previous file | components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data_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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "components/cronet/ios/cronet_environment.h" 5 #include "components/cronet/ios/cronet_environment.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/at_exit.h" 9 #include "base/at_exit.h"
10 #include "base/atomicops.h" 10 #include "base/atomicops.h"
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 params.host_resolver = main_context_->host_resolver(); 315 params.host_resolver = main_context_->host_resolver();
316 params.cert_verifier = main_context_->cert_verifier(); 316 params.cert_verifier = main_context_->cert_verifier();
317 params.channel_id_service = main_context_->channel_id_service(); 317 params.channel_id_service = main_context_->channel_id_service();
318 params.transport_security_state = main_context_->transport_security_state(); 318 params.transport_security_state = main_context_->transport_security_state();
319 params.proxy_service = main_context_->proxy_service(); 319 params.proxy_service = main_context_->proxy_service();
320 params.ssl_config_service = main_context_->ssl_config_service(); 320 params.ssl_config_service = main_context_->ssl_config_service();
321 params.http_auth_handler_factory = main_context_->http_auth_handler_factory(); 321 params.http_auth_handler_factory = main_context_->http_auth_handler_factory();
322 params.http_server_properties = main_context_->http_server_properties(); 322 params.http_server_properties = main_context_->http_server_properties();
323 params.net_log = main_context_->net_log(); 323 params.net_log = main_context_->net_log();
324 params.enable_http2 = http2_enabled(); 324 params.enable_http2 = http2_enabled();
325 params.parse_alternative_services = true;
326 params.enable_quic = quic_enabled(); 325 params.enable_quic = quic_enabled();
327 326
328 for (const auto& quic_hint : quic_hints_) { 327 for (const auto& quic_hint : quic_hints_) {
329 net::AlternativeService alternative_service(net::AlternateProtocol::QUIC, 328 net::AlternativeService alternative_service(net::AlternateProtocol::QUIC,
330 "", quic_hint.port()); 329 "", quic_hint.port());
331 url::SchemeHostPort quic_hint_server("https", quic_hint.host(), 330 url::SchemeHostPort quic_hint_server("https", quic_hint.host(),
332 quic_hint.port()); 331 quic_hint.port());
333 main_context_->http_server_properties()->SetAlternativeService( 332 main_context_->http_server_properties()->SetAlternativeService(
334 quic_hint_server, alternative_service, base::Time::Max()); 333 quic_hint_server, alternative_service, base::Time::Max());
335 params.quic_host_whitelist.insert(quic_hint.host()); 334 params.quic_host_whitelist.insert(quic_hint.host());
(...skipping 28 matching lines...) Expand all
364 const net::HttpUserAgentSettings* user_agent_settings = 363 const net::HttpUserAgentSettings* user_agent_settings =
365 main_context_->http_user_agent_settings(); 364 main_context_->http_user_agent_settings();
366 if (!user_agent_settings) { 365 if (!user_agent_settings) {
367 return nullptr; 366 return nullptr;
368 } 367 }
369 368
370 return user_agent_settings->GetUserAgent(); 369 return user_agent_settings->GetUserAgent();
371 } 370 }
372 371
373 } // namespace cronet 372 } // namespace cronet
OLDNEW
« no previous file with comments | « no previous file | components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698