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

chrome/browser/net/predictor_browsertest.cc

 // Copyright (c) 2012 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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
 #include <set>
@@ skipping 527 matching lines @@
     observer()->set_task_runner(task_runner_);
     StartInterceptingCrossSiteOnUI();
   }
 
   static void StartInterceptingHostWithCreateJobCallback(
       const GURL& url,
       const MatchingPortRequestInterceptor::CreateJobCallback& callback) {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
     net::URLRequestFilter::GetInstance()->AddHostnameInterceptor(
         url.scheme(), url.host(),
-        base::WrapUnique(new MatchingPortRequestInterceptor(
-            url.EffectiveIntPort(), callback)));
+        base::MakeUnique<MatchingPortRequestInterceptor>(url.EffectiveIntPort(),
+                                                         callback));
   }
 
   static void StopInterceptingHost(const GURL& url) {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
     net::URLRequestFilter::GetInstance()->RemoveHostnameHandler(url.scheme(),
                                                                 url.host());
   }
 
   // Intercepts all requests to the specified host and returns a response with
   // an empty body. Needed to prevent requests from actually going to the test
@@ skipping 439 matching lines @@
   // would preconnect 4 sockets if it were doing so based on learning.
   EXPECT_EQ(navigation_preconnects, observer()->CrossSitePreconnected());
 }
 
 IN_PROC_BROWSER_TEST_F(PredictorBrowserTest, PredictBasedOnSubframeRedirect) {
   // A test server is needed here because data url navigations with redirect
   // interceptors don't interact well with the ResourceTiming API.
   // TODO(csharrison): Possibly this is a bug in either net or Blink, and it
   // might be worthwhile to investigate.
   std::unique_ptr<net::EmbeddedTestServer> redirector =
-      base::WrapUnique(new net::EmbeddedTestServer());
+      base::MakeUnique<net::EmbeddedTestServer>();
   ASSERT_TRUE(redirector->Start());
 
   NavigateToCrossSiteHtmlUrl(1 /* num_cors */, "" /* file_suffix */);
   EXPECT_EQ(1, observer()->CrossSiteLearned());
   EXPECT_EQ(0u, cross_site_connection_listener_->GetAcceptedSocketCount());
 
   redirector->RegisterRequestHandler(
       base::Bind(&RedirectForPathHandler, "/",
                  embedded_test_server()->GetURL("/title1.html")));
 
@@ skipping 541 matching lines @@
   // Second navigation to content with an img.
   std::string img_content =
       "<img src=\"" + preconnect_url.spec() + "test.gif\">";
   NavigateToDataURLWithContent(img_content);
   connection_listener_->WaitUntilFirstConnectionRead();
   EXPECT_EQ(2u, connection_listener_->GetAcceptedSocketCount());
   EXPECT_EQ(1u, connection_listener_->GetReadSocketCount());
 }
 
 }  // namespace chrome_browser_net