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

chrome/browser/extensions/extension_action_test_util.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/extensions/extension_action_test_util.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 63 matching lines @@
       }
     }
   }
 
   return count;
 }
 
 // Creates a new ToolbarActionsModel for the given |context|.
 std::unique_ptr<KeyedService> BuildToolbarModel(
     content::BrowserContext* context) {
-  return base::WrapUnique(
-      new ToolbarActionsModel(Profile::FromBrowserContext(context),
-                              extensions::ExtensionPrefs::Get(context)));
+  return base::MakeUnique<ToolbarActionsModel>(
+      Profile::FromBrowserContext(context),
+      extensions::ExtensionPrefs::Get(context));
 }
 
 // Creates a new ToolbarActionsModel for the given profile, optionally
 // triggering the extension system's ready signal.
 ToolbarActionsModel* CreateToolbarModelImpl(Profile* profile,
                                             bool wait_for_ready) {
   ToolbarActionsModel* model = ToolbarActionsModel::Get(profile);
   if (model)
     return model;
 
@@ skipping 69 matching lines @@
   return CreateToolbarModelImpl(profile, true);
 }
 
 ToolbarActionsModel* CreateToolbarModelForProfileWithoutWaitingForReady(
     Profile* profile) {
   return CreateToolbarModelImpl(profile, false);
 }
 
 }  // namespace extension_action_test_util
 }  // namespace extensions