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

chrome/browser/extensions/extension_action_runner_browsertest.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_runner.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 455 matching lines @@
   // injected.
   ExtensionActionRunner* runner =
       ExtensionActionRunner::GetForWebContents(web_contents);
   ASSERT_TRUE(runner);
   EXPECT_TRUE(runner->WantsToRun(extension));
   EXPECT_EQ("undefined", GetValue(web_contents));
 
   // Wire up the runner to automatically accept the bubble to prompt for page
   // refresh.
   runner->set_default_bubble_close_action_for_testing(
-      base::WrapUnique(new ToolbarActionsBarBubbleDelegate::CloseAction(
-          ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE)));
+      base::MakeUnique<ToolbarActionsBarBubbleDelegate::CloseAction>(
+          ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE));
 
   content::NavigationEntry* entry =
       web_contents->GetController().GetLastCommittedEntry();
   ASSERT_TRUE(entry);
   const int first_nav_id = entry->GetUniqueID();
 
   // Run the extension action, which should cause a page refresh (since we
   // automatically accepted the bubble prompting us), and the extension should
   // have injected at document start.
   runner->RunAction(extension, true);
@@ skipping 14 matching lines @@
   web_contents->GetController().Reload(true);
   EXPECT_TRUE(content::WaitForLoadStop(web_contents));
 
   // The extension should again want to run. Automatically dismiss the bubble
   // that pops up prompting for page refresh.
   EXPECT_TRUE(runner->WantsToRun(extension));
   EXPECT_EQ("undefined", GetValue(web_contents));
   const int next_nav_id =
       web_contents->GetController().GetLastCommittedEntry()->GetUniqueID();
   runner->set_default_bubble_close_action_for_testing(
-      base::WrapUnique(new ToolbarActionsBarBubbleDelegate::CloseAction(
-          ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION)));
+      base::MakeUnique<ToolbarActionsBarBubbleDelegate::CloseAction>(
+          ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION));
 
   // Try running the extension. Nothing should happen, because the user
   // didn't agree to refresh the page. The extension should still want to run.
   runner->RunAction(extension, true);
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(content::WaitForLoadStop(web_contents));
   EXPECT_EQ("undefined", GetValue(web_contents));
   EXPECT_EQ(
       next_nav_id,
       web_contents->GetController().GetLastCommittedEntry()->GetUniqueID());
 
   // Repeat with a dismissal from bubble deactivation - same story.
   runner->set_default_bubble_close_action_for_testing(
-      base::WrapUnique(new ToolbarActionsBarBubbleDelegate::CloseAction(
-          ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION)));
+      base::MakeUnique<ToolbarActionsBarBubbleDelegate::CloseAction>(
+          ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION));
   runner->RunAction(extension, true);
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(content::WaitForLoadStop(web_contents));
   EXPECT_EQ("undefined", GetValue(web_contents));
   EXPECT_EQ(
       next_nav_id,
       web_contents->GetController().GetLastCommittedEntry()->GetUniqueID());
 }
 
 // A version of the test with the flag off, in order to test that everything
@@ skipping 23 matching lines @@
 
   ASSERT_TRUE(embedded_test_server()->Start());
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL("/extensions/test_file.html"));
 
   for (size_t i = 0u; i < arraysize(testers); ++i)
     EXPECT_TRUE(testers[i].Verify()) << kExtensionNames[i];
 }
 
 }  // namespace extensions