| 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 <memory> |
| 7 #include <utility> | 8 #include <utility> |
| 8 | 9 |
| 9 #include "base/base_paths.h" | 10 #include "base/base_paths.h" |
| 10 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/memory/ptr_util.h" |
| 11 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
| 12 #include "base/memory/scoped_ptr.h" | |
| 13 #include "base/path_service.h" | 14 #include "base/path_service.h" |
| 14 #include "base/threading/worker_pool.h" | 15 #include "base/threading/worker_pool.h" |
| 15 #include "ios/net/cookies/cookie_store_ios.h" | 16 #include "ios/net/cookies/cookie_store_ios.h" |
| 16 #include "ios/web/public/web_client.h" | 17 #include "ios/web/public/web_client.h" |
| 17 #include "ios/web/public/web_thread.h" | 18 #include "ios/web/public/web_thread.h" |
| 18 #include "ios/web/shell/shell_network_delegate.h" | 19 #include "ios/web/shell/shell_network_delegate.h" |
| 19 #include "net/base/cache_type.h" | 20 #include "net/base/cache_type.h" |
| 20 #include "net/cert/cert_verifier.h" | 21 #include "net/cert/cert_verifier.h" |
| 21 #include "net/dns/host_resolver.h" | 22 #include "net/dns/host_resolver.h" |
| 22 #include "net/extras/sqlite/sqlite_persistent_cookie_store.h" | 23 #include "net/extras/sqlite/sqlite_persistent_cookie_store.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 base::FilePath cookie_path; | 71 base::FilePath cookie_path; |
| 71 bool cookie_path_found = PathService::Get(base::DIR_APP_DATA, &cookie_path); | 72 bool cookie_path_found = PathService::Get(base::DIR_APP_DATA, &cookie_path); |
| 72 DCHECK(cookie_path_found); | 73 DCHECK(cookie_path_found); |
| 73 cookie_path = cookie_path.Append("WebShell").Append("Cookies"); | 74 cookie_path = cookie_path.Append("WebShell").Append("Cookies"); |
| 74 scoped_refptr<net::CookieMonster::PersistentCookieStore> persistent_store = | 75 scoped_refptr<net::CookieMonster::PersistentCookieStore> persistent_store = |
| 75 new net::SQLitePersistentCookieStore( | 76 new net::SQLitePersistentCookieStore( |
| 76 cookie_path, network_task_runner_, | 77 cookie_path, network_task_runner_, |
| 77 web::WebThread::GetBlockingPool()->GetSequencedTaskRunner( | 78 web::WebThread::GetBlockingPool()->GetSequencedTaskRunner( |
| 78 web::WebThread::GetBlockingPool()->GetSequenceToken()), | 79 web::WebThread::GetBlockingPool()->GetSequenceToken()), |
| 79 true, nullptr); | 80 true, nullptr); |
| 80 scoped_ptr<net::CookieStoreIOS> cookie_store( | 81 std::unique_ptr<net::CookieStoreIOS> cookie_store( |
| 81 new net::CookieStoreIOS(persistent_store.get())); | 82 new net::CookieStoreIOS(persistent_store.get())); |
| 82 net::CookieStoreIOS::SwitchSynchronizedStore(nullptr, cookie_store.get()); | 83 net::CookieStoreIOS::SwitchSynchronizedStore(nullptr, cookie_store.get()); |
| 83 storage_->set_cookie_store(std::move(cookie_store)); | 84 storage_->set_cookie_store(std::move(cookie_store)); |
| 84 | 85 |
| 85 std::string user_agent = web::GetWebClient()->GetUserAgent(false); | 86 std::string user_agent = web::GetWebClient()->GetUserAgent(false); |
| 86 storage_->set_http_user_agent_settings(make_scoped_ptr( | 87 storage_->set_http_user_agent_settings(base::WrapUnique( |
| 87 new net::StaticHttpUserAgentSettings("en-us,en", user_agent))); | 88 new net::StaticHttpUserAgentSettings("en-us,en", user_agent))); |
| 88 storage_->set_proxy_service( | 89 storage_->set_proxy_service( |
| 89 net::ProxyService::CreateUsingSystemProxyResolver( | 90 net::ProxyService::CreateUsingSystemProxyResolver( |
| 90 std::move(proxy_config_service_), 0, | 91 std::move(proxy_config_service_), 0, |
| 91 url_request_context_->net_log())); | 92 url_request_context_->net_log())); |
| 92 storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults); | 93 storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults); |
| 93 storage_->set_cert_verifier(net::CertVerifier::CreateDefault()); | 94 storage_->set_cert_verifier(net::CertVerifier::CreateDefault()); |
| 94 | 95 |
| 95 storage_->set_transport_security_state( | 96 storage_->set_transport_security_state( |
| 96 make_scoped_ptr(new net::TransportSecurityState())); | 97 base::WrapUnique(new net::TransportSecurityState())); |
| 97 transport_security_persister_.reset(new net::TransportSecurityPersister( | 98 transport_security_persister_.reset(new net::TransportSecurityPersister( |
| 98 url_request_context_->transport_security_state(), base_path_, | 99 url_request_context_->transport_security_state(), base_path_, |
| 99 file_task_runner_, false)); | 100 file_task_runner_, false)); |
| 100 storage_->set_channel_id_service(make_scoped_ptr( | 101 storage_->set_channel_id_service(base::WrapUnique( |
| 101 new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr), | 102 new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr), |
| 102 base::WorkerPool::GetTaskRunner(true)))); | 103 base::WorkerPool::GetTaskRunner(true)))); |
| 103 storage_->set_http_server_properties(scoped_ptr<net::HttpServerProperties>( | 104 storage_->set_http_server_properties( |
| 104 new net::HttpServerPropertiesImpl())); | 105 std::unique_ptr<net::HttpServerProperties>( |
| 106 new net::HttpServerPropertiesImpl())); |
| 105 | 107 |
| 106 scoped_ptr<net::HostResolver> host_resolver( | 108 std::unique_ptr<net::HostResolver> host_resolver( |
| 107 net::HostResolver::CreateDefaultResolver( | 109 net::HostResolver::CreateDefaultResolver( |
| 108 url_request_context_->net_log())); | 110 url_request_context_->net_log())); |
| 109 storage_->set_http_auth_handler_factory( | 111 storage_->set_http_auth_handler_factory( |
| 110 net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get())); | 112 net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get())); |
| 111 storage_->set_host_resolver(std::move(host_resolver)); | 113 storage_->set_host_resolver(std::move(host_resolver)); |
| 112 | 114 |
| 113 net::HttpNetworkSession::Params network_session_params; | 115 net::HttpNetworkSession::Params network_session_params; |
| 114 network_session_params.cert_verifier = | 116 network_session_params.cert_verifier = |
| 115 url_request_context_->cert_verifier(); | 117 url_request_context_->cert_verifier(); |
| 116 network_session_params.transport_security_state = | 118 network_session_params.transport_security_state = |
| 117 url_request_context_->transport_security_state(); | 119 url_request_context_->transport_security_state(); |
| 118 network_session_params.channel_id_service = | 120 network_session_params.channel_id_service = |
| 119 url_request_context_->channel_id_service(); | 121 url_request_context_->channel_id_service(); |
| 120 network_session_params.net_log = url_request_context_->net_log(); | 122 network_session_params.net_log = url_request_context_->net_log(); |
| 121 network_session_params.proxy_service = | 123 network_session_params.proxy_service = |
| 122 url_request_context_->proxy_service(); | 124 url_request_context_->proxy_service(); |
| 123 network_session_params.ssl_config_service = | 125 network_session_params.ssl_config_service = |
| 124 url_request_context_->ssl_config_service(); | 126 url_request_context_->ssl_config_service(); |
| 125 network_session_params.http_auth_handler_factory = | 127 network_session_params.http_auth_handler_factory = |
| 126 url_request_context_->http_auth_handler_factory(); | 128 url_request_context_->http_auth_handler_factory(); |
| 127 network_session_params.http_server_properties = | 129 network_session_params.http_server_properties = |
| 128 url_request_context_->http_server_properties(); | 130 url_request_context_->http_server_properties(); |
| 129 network_session_params.host_resolver = | 131 network_session_params.host_resolver = |
| 130 url_request_context_->host_resolver(); | 132 url_request_context_->host_resolver(); |
| 131 | 133 |
| 132 base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache")); | 134 base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache")); |
| 133 scoped_ptr<net::HttpCache::DefaultBackend> main_backend( | 135 std::unique_ptr<net::HttpCache::DefaultBackend> main_backend( |
| 134 new net::HttpCache::DefaultBackend(net::DISK_CACHE, | 136 new net::HttpCache::DefaultBackend(net::DISK_CACHE, |
| 135 net::CACHE_BACKEND_DEFAULT, | 137 net::CACHE_BACKEND_DEFAULT, |
| 136 cache_path, 0, cache_task_runner_)); | 138 cache_path, 0, cache_task_runner_)); |
| 137 | 139 |
| 138 storage_->set_http_network_session( | 140 storage_->set_http_network_session( |
| 139 make_scoped_ptr(new net::HttpNetworkSession(network_session_params))); | 141 base::WrapUnique(new net::HttpNetworkSession(network_session_params))); |
| 140 storage_->set_http_transaction_factory(make_scoped_ptr(new net::HttpCache( | 142 storage_->set_http_transaction_factory(base::WrapUnique(new net::HttpCache( |
| 141 storage_->http_network_session(), std::move(main_backend), | 143 storage_->http_network_session(), std::move(main_backend), |
| 142 true /* set_up_quic_server_info */))); | 144 true /* set_up_quic_server_info */))); |
| 143 | 145 |
| 144 scoped_ptr<net::URLRequestJobFactoryImpl> job_factory( | 146 std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory( |
| 145 new net::URLRequestJobFactoryImpl()); | 147 new net::URLRequestJobFactoryImpl()); |
| 146 bool set_protocol = job_factory->SetProtocolHandler( | 148 bool set_protocol = job_factory->SetProtocolHandler( |
| 147 "data", make_scoped_ptr(new net::DataProtocolHandler)); | 149 "data", base::WrapUnique(new net::DataProtocolHandler)); |
| 148 DCHECK(set_protocol); | 150 DCHECK(set_protocol); |
| 149 | 151 |
| 150 storage_->set_job_factory(std::move(job_factory)); | 152 storage_->set_job_factory(std::move(job_factory)); |
| 151 } | 153 } |
| 152 | 154 |
| 153 return url_request_context_.get(); | 155 return url_request_context_.get(); |
| 154 } | 156 } |
| 155 | 157 |
| 156 scoped_refptr<base::SingleThreadTaskRunner> | 158 scoped_refptr<base::SingleThreadTaskRunner> |
| 157 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { | 159 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { |
| 158 return network_task_runner_; | 160 return network_task_runner_; |
| 159 } | 161 } |
| 160 | 162 |
| 161 } // namespace web | 163 } // namespace web |
| OLD | NEW |