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

chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner_unittest.cc

 // 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 "chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h"
 
 #include <map>
 #include <memory>
 #include <string>
 
@@ skipping 52 matching lines @@
 
   void OnDelete(const std::string& name) {
     EXPECT_FALSE(callbacks_[name].deleted);
     callbacks_[name].deleted = true;
   }
 
   // Returns a callback argument that calls the test fixture's OnDelete method
   // on behalf of the given callback name.
   std::unique_ptr<CallbackArgument> MakeCallbackArgument(
       const std::string& name) {
-    return base::WrapUnique(new CallbackArgument(base::Bind(
-        &DelayedCallbackRunnerTest::OnDelete, base::Unretained(this), name)));
+    return base::MakeUnique<CallbackArgument>(base::Bind(
+        &DelayedCallbackRunnerTest::OnDelete, base::Unretained(this), name));
   }
 
   // Returns a closure that calls |OnRun| when run and |OnDelete| when deleted
   // on behalf of the given callback name.
   base::Closure MakeCallback(const std::string& name) {
     return base::Bind(&DelayedCallbackRunnerTest::OnRun,
                       base::Unretained(this),
                       name,
                       base::Owned(MakeCallbackArgument(name).release()));
   }
@@ skipping 65 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(CallbackWasRun(name));
   EXPECT_TRUE(CallbackWasDeleted(name));
 
   RegisterTestCallback(name2);
   instance_->Start();
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(CallbackWasRun(name2));
   EXPECT_TRUE(CallbackWasDeleted(name2));
 }