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

net/url_request/url_request_test_util.cc

Index: net/url_request/url_request_test_util.cc
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index 39b7604f910aebbb3894cd17e32d44b62c7f3106..5a026d395342b32da3904ca1d8ad46d70eccc2ee 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -80,11 +80,11 @@ void TestURLRequestContext::Init() {
     context_storage_.set_cert_verifier(CertVerifier::CreateDefault());
   if (!transport_security_state()) {
     context_storage_.set_transport_security_state(
-        base::WrapUnique(new TransportSecurityState()));
+        base::MakeUnique<TransportSecurityState>());
   }
   if (!cert_transparency_verifier()) {
     context_storage_.set_cert_transparency_verifier(
-        base::WrapUnique(new MultiLogCTVerifier()));
+        base::MakeUnique<MultiLogCTVerifier>());
   }
   if (!ct_policy_enforcer()) {
     context_storage_.set_ct_policy_enforcer(
@@ -103,14 +103,14 @@ void TestURLRequestContext::Init() {
   // In-memory cookie store.
   if (!cookie_store()) {
     context_storage_.set_cookie_store(
-        base::WrapUnique(new CookieMonster(nullptr, nullptr)));
+        base::MakeUnique<CookieMonster>(nullptr, nullptr));
   }
   // In-memory Channel ID service.  Must be created before the
   // HttpNetworkSession.
   if (!channel_id_service()) {
-    context_storage_.set_channel_id_service(base::WrapUnique(
-        new ChannelIDService(new DefaultChannelIDStore(nullptr),
-                             base::WorkerPool::GetTaskRunner(true))));
+    context_storage_.set_channel_id_service(base::MakeUnique<ChannelIDService>(
+        new DefaultChannelIDStore(nullptr),
+        base::WorkerPool::GetTaskRunner(true)));
   }
   if (http_transaction_factory()) {
     // Make sure we haven't been passed an object we're not going to use.
@@ -134,18 +134,19 @@ void TestURLRequestContext::Init() {
     params.net_log = net_log();
     params.channel_id_service = channel_id_service();
     context_storage_.set_http_network_session(
-        base::WrapUnique(new HttpNetworkSession(params)));
-    context_storage_.set_http_transaction_factory(base::WrapUnique(
-        new HttpCache(context_storage_.http_network_session(),
-                      HttpCache::DefaultBackend::InMemory(0), false)));
+        base::MakeUnique<HttpNetworkSession>(params));
+    context_storage_.set_http_transaction_factory(base::MakeUnique<HttpCache>(
+        context_storage_.http_network_session(),
+        HttpCache::DefaultBackend::InMemory(0), false));
   }
   if (!http_user_agent_settings()) {
-    context_storage_.set_http_user_agent_settings(base::WrapUnique(
-        new StaticHttpUserAgentSettings("en-us,fr", std::string())));
+    context_storage_.set_http_user_agent_settings(
+        base::MakeUnique<StaticHttpUserAgentSettings>("en-us,fr",
+                                                      std::string()));
   }
   if (!job_factory()) {
     context_storage_.set_job_factory(
-        base::WrapUnique(new URLRequestJobFactoryImpl()));
+        base::MakeUnique<URLRequestJobFactoryImpl>());
   }
 }