| OLD | NEW |
| 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 "components/cronet/url_request_context_config.h" | 5 #include "components/cronet/url_request_context_config.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 | 242 |
| 243 const base::DictionaryValue* host_resolver_rules_args = nullptr; | 243 const base::DictionaryValue* host_resolver_rules_args = nullptr; |
| 244 if (dict->GetDictionary(kHostResolverRulesFieldTrialName, | 244 if (dict->GetDictionary(kHostResolverRulesFieldTrialName, |
| 245 &host_resolver_rules_args)) { | 245 &host_resolver_rules_args)) { |
| 246 host_resolver_rules_enable = host_resolver_rules_args->GetString( | 246 host_resolver_rules_enable = host_resolver_rules_args->GetString( |
| 247 kHostResolverRules, &host_resolver_rules_string); | 247 kHostResolverRules, &host_resolver_rules_string); |
| 248 } | 248 } |
| 249 | 249 |
| 250 if (async_dns_enable || stale_dns_enable || host_resolver_rules_enable) { | 250 if (async_dns_enable || stale_dns_enable || host_resolver_rules_enable) { |
| 251 if (net_log == nullptr) { | 251 if (net_log == nullptr) { |
| 252 CHECK(false) << "AsyncDNS, StaleDNS, and HostResolverRules experiments " | 252 // AsyncDNS, StaleDNS, and HostResolverRules experiments require NetLog. |
| 253 << "require NetLog."; | 253 CHECK(false); |
| 254 } | 254 } |
| 255 std::unique_ptr<net::HostResolver> host_resolver; | 255 std::unique_ptr<net::HostResolver> host_resolver; |
| 256 if (stale_dns_enable) { | 256 if (stale_dns_enable) { |
| 257 host_resolver.reset(new StaleHostResolver( | 257 host_resolver.reset(new StaleHostResolver( |
| 258 net::HostResolver::CreateDefaultResolverImpl(net_log), | 258 net::HostResolver::CreateDefaultResolverImpl(net_log), |
| 259 stale_dns_options)); | 259 stale_dns_options)); |
| 260 } else { | 260 } else { |
| 261 host_resolver = net::HostResolver::CreateDefaultResolver(net_log); | 261 host_resolver = net::HostResolver::CreateDefaultResolver(net_log); |
| 262 } | 262 } |
| 263 if (async_dns_enable) | 263 if (async_dns_enable) |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 386 std::move(mock_cert_verifier)); | 386 std::move(mock_cert_verifier)); |
| 387 } else { | 387 } else { |
| 388 // net::CertVerifier::CreateDefault() returns a CachingCertVerifier. | 388 // net::CertVerifier::CreateDefault() returns a CachingCertVerifier. |
| 389 cert_verifier = net::CertVerifier::CreateDefault(); | 389 cert_verifier = net::CertVerifier::CreateDefault(); |
| 390 } | 390 } |
| 391 context_builder->SetCertVerifier(std::move(cert_verifier)); | 391 context_builder->SetCertVerifier(std::move(cert_verifier)); |
| 392 // TODO(mef): Use |config| to set cookies. | 392 // TODO(mef): Use |config| to set cookies. |
| 393 } | 393 } |
| 394 | 394 |
| 395 } // namespace cronet | 395 } // namespace cronet |
| OLD | NEW |