| 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 "ios/web/shell/shell_url_request_context_getter.h" | 5 #include "ios/web/shell/shell_url_request_context_getter.h" |
| 6 | 6 |
| 7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 storage_->set_cookie_store(cookie_store.get()); | 82 storage_->set_cookie_store(cookie_store.get()); |
| 83 net::CookieStoreIOS::SwitchSynchronizedStore(nullptr, cookie_store.get()); | 83 net::CookieStoreIOS::SwitchSynchronizedStore(nullptr, cookie_store.get()); |
| 84 | 84 |
| 85 std::string user_agent = web::GetWebClient()->GetUserAgent(false); | 85 std::string user_agent = web::GetWebClient()->GetUserAgent(false); |
| 86 storage_->set_http_user_agent_settings( | 86 storage_->set_http_user_agent_settings( |
| 87 make_scoped_ptr( | 87 make_scoped_ptr( |
| 88 new net::StaticHttpUserAgentSettings("en-us,en", user_agent)) | 88 new net::StaticHttpUserAgentSettings("en-us,en", user_agent)) |
| 89 .Pass()); | 89 .Pass()); |
| 90 storage_->set_proxy_service( | 90 storage_->set_proxy_service( |
| 91 net::ProxyService::CreateUsingSystemProxyResolver( | 91 net::ProxyService::CreateUsingSystemProxyResolver( |
| 92 proxy_config_service_.release(), 0, | 92 proxy_config_service_.Pass(), 0, url_request_context_->net_log())); |
| 93 url_request_context_->net_log())); | |
| 94 storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults); | 93 storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults); |
| 95 storage_->set_cert_verifier(net::CertVerifier::CreateDefault()); | 94 storage_->set_cert_verifier(net::CertVerifier::CreateDefault()); |
| 96 | 95 |
| 97 storage_->set_transport_security_state( | 96 storage_->set_transport_security_state( |
| 98 make_scoped_ptr(new net::TransportSecurityState())); | 97 make_scoped_ptr(new net::TransportSecurityState())); |
| 99 transport_security_persister_.reset(new net::TransportSecurityPersister( | 98 transport_security_persister_.reset(new net::TransportSecurityPersister( |
| 100 url_request_context_->transport_security_state(), base_path_, | 99 url_request_context_->transport_security_state(), base_path_, |
| 101 file_task_runner_, false)); | 100 file_task_runner_, false)); |
| 102 storage_->set_channel_id_service(make_scoped_ptr( | 101 storage_->set_channel_id_service(make_scoped_ptr( |
| 103 new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr), | 102 new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr), |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 | 153 |
| 155 return url_request_context_.get(); | 154 return url_request_context_.get(); |
| 156 } | 155 } |
| 157 | 156 |
| 158 scoped_refptr<base::SingleThreadTaskRunner> | 157 scoped_refptr<base::SingleThreadTaskRunner> |
| 159 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { | 158 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { |
| 160 return network_task_runner_; | 159 return network_task_runner_; |
| 161 } | 160 } |
| 162 | 161 |
| 163 } // namespace web | 162 } // namespace web |
| OLD | NEW |