Re-write many calls to WrapUnique() with MakeUnique()

ios/web/shell/shell_url_request_context_getter.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ios/web/shell/shell_url_request_context_getter.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/base_paths.h"
@@ skipping 72 matching lines @@
             cookie_path, network_task_runner_,
             web::WebThread::GetBlockingPool()->GetSequencedTaskRunner(
                 web::WebThread::GetBlockingPool()->GetSequenceToken()),
             true, nullptr);
     std::unique_ptr<net::CookieStoreIOS> cookie_store(
         new net::CookieStoreIOS(persistent_store.get()));
     net::CookieStoreIOS::SwitchSynchronizedStore(nullptr, cookie_store.get());
     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,
             url_request_context_->net_log()));
     storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
     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(
         base::WrapUnique(new net::CTPolicyEnforcer));
     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()));
 
     std::unique_ptr<net::HostResolver> host_resolver(
         net::HostResolver::CreateDefaultResolver(
             url_request_context_->net_log()));
     storage_->set_http_auth_handler_factory(
         net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
     storage_->set_host_resolver(std::move(host_resolver));
@@ skipping 21 matching lines @@
     network_session_params.host_resolver =
         url_request_context_->host_resolver();
 
     base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache"));
     std::unique_ptr<net::HttpCache::DefaultBackend> main_backend(
         new net::HttpCache::DefaultBackend(net::DISK_CACHE,
                                            net::CACHE_BACKEND_DEFAULT,
                                            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());
     bool set_protocol = job_factory->SetProtocolHandler(
         "data", base::WrapUnique(new net::DataProtocolHandler));
     DCHECK(set_protocol);
 
     storage_->set_job_factory(std::move(job_factory));
   }
 
   return url_request_context_.get();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 ShellURLRequestContextGetter::GetNetworkTaskRunner() const {
   return network_task_runner_;
 }
 
 }  // namespace web