Chromium Code Reviews| OLD | NEW |
|---|---|
| 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" |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/feature_list.h" | 12 #include "base/feature_list.h" |
| 13 #include "base/files/file_path.h" | 13 #include "base/files/file_path.h" |
| 14 #include "base/files/file_util.h" | 14 #include "base/files/file_util.h" |
| 15 #include "base/files/scoped_file.h" | 15 #include "base/files/scoped_file.h" |
| 16 #include "base/json/json_writer.h" | 16 #include "base/json/json_writer.h" |
| 17 #include "base/mac/bind_objc_block.h" | 17 #include "base/mac/bind_objc_block.h" |
| 18 #include "base/mac/foundation_util.h" | 18 #include "base/mac/foundation_util.h" |
| 19 #include "base/macros.h" | 19 #include "base/macros.h" |
| 20 #include "base/memory/ptr_util.h" | 20 #include "base/memory/ptr_util.h" |
| 21 #include "base/metrics/statistics_recorder.h" | 21 #include "base/metrics/statistics_recorder.h" |
| 22 #include "base/path_service.h" | 22 #include "base/path_service.h" |
| 23 #include "base/single_thread_task_runner.h" | 23 #include "base/single_thread_task_runner.h" |
| 24 #include "base/synchronization/waitable_event.h" | 24 #include "base/synchronization/waitable_event.h" |
| 25 #include "base/threading/worker_pool.h" | 25 #include "base/threading/worker_pool.h" |
| 26 #include "components/cronet/ct_ignores.h" | |
| 26 #include "components/cronet/histogram_manager.h" | 27 #include "components/cronet/histogram_manager.h" |
| 27 #include "components/cronet/ios/version.h" | 28 #include "components/cronet/ios/version.h" |
| 28 #include "components/prefs/json_pref_store.h" | 29 #include "components/prefs/json_pref_store.h" |
| 29 #include "components/prefs/pref_filter.h" | 30 #include "components/prefs/pref_filter.h" |
| 30 #include "ios/web/public/user_agent.h" | 31 #include "ios/web/public/user_agent.h" |
| 31 #include "net/base/net_errors.h" | 32 #include "net/base/net_errors.h" |
| 32 #include "net/base/network_change_notifier.h" | 33 #include "net/base/network_change_notifier.h" |
| 33 #include "net/cert/cert_verifier.h" | 34 #include "net/cert/cert_verifier.h" |
| 34 #include "net/cert/ct_known_logs.h" | |
| 35 #include "net/cert/ct_log_verifier.h" | |
| 36 #include "net/cert/ct_policy_enforcer.h" | |
| 37 #include "net/cert/ct_verifier.h" | |
| 38 #include "net/cert/multi_log_ct_verifier.h" | |
| 39 #include "net/dns/host_resolver.h" | 35 #include "net/dns/host_resolver.h" |
| 40 #include "net/dns/mapped_host_resolver.h" | 36 #include "net/dns/mapped_host_resolver.h" |
| 41 #include "net/http/http_auth_handler_factory.h" | 37 #include "net/http/http_auth_handler_factory.h" |
| 42 #include "net/http/http_cache.h" | 38 #include "net/http/http_cache.h" |
| 43 #include "net/http/http_response_headers.h" | 39 #include "net/http/http_response_headers.h" |
| 44 #include "net/http/http_server_properties_impl.h" | 40 #include "net/http/http_server_properties_impl.h" |
| 45 #include "net/http/http_stream_factory.h" | 41 #include "net/http/http_stream_factory.h" |
| 46 #include "net/http/http_util.h" | 42 #include "net/http/http_util.h" |
| 47 #include "net/log/net_log.h" | 43 #include "net/log/net_log.h" |
| 48 #include "net/log/net_log_capture_mode.h" | 44 #include "net/log/net_log_capture_mode.h" |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 296 std::unique_ptr<net::MappedHostResolver> mapped_host_resolver( | 292 std::unique_ptr<net::MappedHostResolver> mapped_host_resolver( |
| 297 new net::MappedHostResolver( | 293 new net::MappedHostResolver( |
| 298 net::HostResolver::CreateDefaultResolver(nullptr))); | 294 net::HostResolver::CreateDefaultResolver(nullptr))); |
| 299 | 295 |
| 300 mapped_host_resolver->SetRulesFromString(host_resolver_rules_); | 296 mapped_host_resolver->SetRulesFromString(host_resolver_rules_); |
| 301 main_context_->set_host_resolver(mapped_host_resolver.release()); | 297 main_context_->set_host_resolver(mapped_host_resolver.release()); |
| 302 | 298 |
| 303 if (!cert_verifier_) | 299 if (!cert_verifier_) |
| 304 cert_verifier_ = net::CertVerifier::CreateDefault(); | 300 cert_verifier_ = net::CertVerifier::CreateDefault(); |
| 305 main_context_->set_cert_verifier(cert_verifier_.get()); | 301 main_context_->set_cert_verifier(cert_verifier_.get()); |
| 306 | 302 main_context_->set_cert_transparency_verifier(new IgnoresCTVerifier()); |
|
mef
2016/11/10 20:55:43
The iOS implementation is being reworked to use Ur
| |
| 307 std::unique_ptr<net::MultiLogCTVerifier> ct_verifier = | 303 main_context_->set_ct_policy_enforcer(new IgnoresCTPolicyEnforcer()); |
| 308 base::MakeUnique<net::MultiLogCTVerifier>(); | |
| 309 ct_verifier->AddLogs(net::ct::CreateLogVerifiersForKnownLogs()); | |
| 310 main_context_->set_cert_transparency_verifier(ct_verifier.release()); | |
| 311 main_context_->set_ct_policy_enforcer(new net::CTPolicyEnforcer()); | |
| 312 | 304 |
| 313 main_context_->set_http_auth_handler_factory( | 305 main_context_->set_http_auth_handler_factory( |
| 314 net::HttpAuthHandlerRegistryFactory::CreateDefault( | 306 net::HttpAuthHandlerRegistryFactory::CreateDefault( |
| 315 main_context_->host_resolver()) | 307 main_context_->host_resolver()) |
| 316 .release()); | 308 .release()); |
| 317 main_context_->set_proxy_service( | 309 main_context_->set_proxy_service( |
| 318 net::ProxyService::CreateUsingSystemProxyResolver( | 310 net::ProxyService::CreateUsingSystemProxyResolver( |
| 319 std::move(proxy_config_service_), 0, nullptr) | 311 std::move(proxy_config_service_), 0, nullptr) |
| 320 .release()); | 312 .release()); |
| 321 | 313 |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 394 | 386 |
| 395 std::vector<uint8_t> CronetEnvironment::GetHistogramDeltas() { | 387 std::vector<uint8_t> CronetEnvironment::GetHistogramDeltas() { |
| 396 base::StatisticsRecorder::Initialize(); | 388 base::StatisticsRecorder::Initialize(); |
| 397 std::vector<uint8_t> data; | 389 std::vector<uint8_t> data; |
| 398 if (!HistogramManager::GetInstance()->GetDeltas(&data)) | 390 if (!HistogramManager::GetInstance()->GetDeltas(&data)) |
| 399 return std::vector<uint8_t>(); | 391 return std::vector<uint8_t>(); |
| 400 return data; | 392 return data; |
| 401 } | 393 } |
| 402 | 394 |
| 403 } // namespace cronet | 395 } // namespace cronet |
| OLD | NEW |