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

chrome/browser/extensions/extension_message_bubble_controller_unittest.cc

 // Copyright (c) 2013 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 <utility>
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 37 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const char kId1[] = "iccfkkhkfiphcjdakkmcjmkfboccmndk";
 const char kId2[] = "ajjhifimiemdpmophmkkkcijegphclbl";
 const char kId3[] = "ioibbbfddncmmabjmpokikkeiofalaek";
 
 std::unique_ptr<KeyedService> BuildOverrideRegistrar(
     content::BrowserContext* context) {
-  return base::WrapUnique(
-      new extensions::ExtensionWebUIOverrideRegistrar(context));
+  return base::MakeUnique<extensions::ExtensionWebUIOverrideRegistrar>(context);
 }
 
 // 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));
 }
 
 }  // namespace
 
 namespace extensions {
 
 class TestExtensionMessageBubbleController :
     public ExtensionMessageBubbleController {
  public:
   TestExtensionMessageBubbleController(
@@ skipping 965 matching lines @@
   EXPECT_TRUE(controller->ShouldShow());
   EXPECT_EQ(1u, model->toolbar_items().size());
   controller->HighlightExtensionsIfNecessary();
   EXPECT_TRUE(ToolbarActionsModel::Get(profile())->is_highlighting());
   set_browser(nullptr);
   EXPECT_FALSE(ToolbarActionsModel::Get(profile())->is_highlighting());
   controller.reset();
 }
 
 }  // namespace extensions