| Index: ios/web/shell/shell_url_request_context_getter.mm
|
| diff --git a/ios/web/shell/shell_url_request_context_getter.mm b/ios/web/shell/shell_url_request_context_getter.mm
|
| index 3440a612146b36200075656f8828a2af6dd9d941..f784595dd1ee926fed15ecb8b202ebdfc5191fda 100644
|
| --- a/ios/web/shell/shell_url_request_context_getter.mm
|
| +++ b/ios/web/shell/shell_url_request_context_getter.mm
|
| @@ -90,8 +90,9 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
|
| storage_->set_cookie_store(std::move(cookie_store));
|
|
|
| std::string user_agent = web::GetWebClient()->GetUserAgent(false);
|
| - storage_->set_http_user_agent_settings(base::WrapUnique(
|
| - new net::StaticHttpUserAgentSettings("en-us,en", user_agent)));
|
| + storage_->set_http_user_agent_settings(
|
| + base::MakeUnique<net::StaticHttpUserAgentSettings>("en-us,en",
|
| + user_agent));
|
| storage_->set_proxy_service(
|
| net::ProxyService::CreateUsingSystemProxyResolver(
|
| std::move(proxy_config_service_), 0,
|
| @@ -100,7 +101,7 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
|
| storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
|
|
|
| storage_->set_transport_security_state(
|
| - base::WrapUnique(new net::TransportSecurityState()));
|
| + base::MakeUnique<net::TransportSecurityState>());
|
| storage_->set_cert_transparency_verifier(
|
| base::WrapUnique(new net::MultiLogCTVerifier));
|
| storage_->set_ct_policy_enforcer(
|
| @@ -108,9 +109,9 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
|
| transport_security_persister_.reset(new net::TransportSecurityPersister(
|
| url_request_context_->transport_security_state(), base_path_,
|
| file_task_runner_, false));
|
| - storage_->set_channel_id_service(base::WrapUnique(
|
| - new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr),
|
| - base::WorkerPool::GetTaskRunner(true))));
|
| + storage_->set_channel_id_service(base::MakeUnique<net::ChannelIDService>(
|
| + new net::DefaultChannelIDStore(nullptr),
|
| + base::WorkerPool::GetTaskRunner(true)));
|
| storage_->set_http_server_properties(
|
| std::unique_ptr<net::HttpServerProperties>(
|
| new net::HttpServerPropertiesImpl()));
|
| @@ -152,10 +153,10 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
|
| cache_path, 0, cache_task_runner_));
|
|
|
| storage_->set_http_network_session(
|
| - base::WrapUnique(new net::HttpNetworkSession(network_session_params)));
|
| - storage_->set_http_transaction_factory(base::WrapUnique(new net::HttpCache(
|
| + base::MakeUnique<net::HttpNetworkSession>(network_session_params));
|
| + storage_->set_http_transaction_factory(base::MakeUnique<net::HttpCache>(
|
| storage_->http_network_session(), std::move(main_backend),
|
| - true /* set_up_quic_server_info */)));
|
| + true /* set_up_quic_server_info */));
|
|
|
| std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory(
|
| new net::URLRequestJobFactoryImpl());
|
|
|