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

ui/message_center/message_center_impl_unittest.cc

 // Copyright 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 "ui/message_center/message_center_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 237 matching lines @@
   const std::string& last_id() const { return last_id_; }
 
  private:
   bool timer_finished_;
   std::string last_id_;
   base::Closure quit_closure_;
 };
 
 TEST_F(MessageCenterImplTest, PopupTimersEmptyController) {
   std::unique_ptr<PopupTimersController> popup_timers_controller =
-      base::WrapUnique(new PopupTimersController(message_center()));
+      base::MakeUnique<PopupTimersController>(message_center());
 
   // Test that all functions succed without any timers created.
   popup_timers_controller->PauseAll();
   popup_timers_controller->StartAll();
   popup_timers_controller->CancelAll();
   popup_timers_controller->TimerFinished("unknown");
   popup_timers_controller->PauseTimer("unknown");
   popup_timers_controller->CancelTimer("unknown");
 }
 
 TEST_F(MessageCenterImplTest, PopupTimersControllerStartTimer) {
   std::unique_ptr<MockPopupTimersController> popup_timers_controller =
-      base::WrapUnique(
-          new MockPopupTimersController(message_center(), closure()));
+      base::MakeUnique<MockPopupTimersController>(message_center(), closure());
   popup_timers_controller->StartTimer("test",
                                       base::TimeDelta::FromMilliseconds(1));
   run_loop()->Run();
   EXPECT_TRUE(popup_timers_controller->timer_finished());
 }
 
 TEST_F(MessageCenterImplTest, PopupTimersControllerPauseTimer) {
   std::unique_ptr<MockPopupTimersController> popup_timers_controller =
-      base::WrapUnique(
-          new MockPopupTimersController(message_center(), closure()));
+      base::MakeUnique<MockPopupTimersController>(message_center(), closure());
   popup_timers_controller->StartTimer("test",
                                       base::TimeDelta::FromMilliseconds(1));
   popup_timers_controller->PauseTimer("test");
   run_loop()->RunUntilIdle();
 
   EXPECT_FALSE(popup_timers_controller->timer_finished());
 }
 
 TEST_F(MessageCenterImplTest, PopupTimersControllerCancelTimer) {
   std::unique_ptr<MockPopupTimersController> popup_timers_controller =
-      base::WrapUnique(
-          new MockPopupTimersController(message_center(), closure()));
+      base::MakeUnique<MockPopupTimersController>(message_center(), closure());
   popup_timers_controller->StartTimer("test",
                                       base::TimeDelta::FromMilliseconds(1));
   popup_timers_controller->CancelTimer("test");
   run_loop()->RunUntilIdle();
 
   EXPECT_FALSE(popup_timers_controller->timer_finished());
 }
 
 TEST_F(MessageCenterImplTest, PopupTimersControllerPauseAllTimers) {
   std::unique_ptr<MockPopupTimersController> popup_timers_controller =
-      base::WrapUnique(
-          new MockPopupTimersController(message_center(), closure()));
+      base::MakeUnique<MockPopupTimersController>(message_center(), closure());
   popup_timers_controller->StartTimer("test",
                                       base::TimeDelta::FromMilliseconds(1));
   popup_timers_controller->PauseAll();
   run_loop()->RunUntilIdle();
 
   EXPECT_FALSE(popup_timers_controller->timer_finished());
 }
 
 TEST_F(MessageCenterImplTest, PopupTimersControllerStartAllTimers) {
   std::unique_ptr<MockPopupTimersController> popup_timers_controller =
-      base::WrapUnique(
-          new MockPopupTimersController(message_center(), closure()));
+      base::MakeUnique<MockPopupTimersController>(message_center(), closure());
   popup_timers_controller->StartTimer("test",
                                       base::TimeDelta::FromMilliseconds(1));
   popup_timers_controller->PauseAll();
   popup_timers_controller->StartAll();
   run_loop()->Run();
 
   EXPECT_TRUE(popup_timers_controller->timer_finished());
 }
 
 TEST_F(MessageCenterImplTest, PopupTimersControllerStartMultipleTimers) {
   std::unique_ptr<MockPopupTimersController> popup_timers_controller =
-      base::WrapUnique(
-          new MockPopupTimersController(message_center(), closure()));
+      base::MakeUnique<MockPopupTimersController>(message_center(), closure());
   popup_timers_controller->StartTimer("test",
                                       base::TimeDelta::FromMilliseconds(5));
   popup_timers_controller->StartTimer("test2",
                                       base::TimeDelta::FromMilliseconds(1));
   popup_timers_controller->StartTimer("test3",
                                       base::TimeDelta::FromMilliseconds(3));
   popup_timers_controller->PauseAll();
   popup_timers_controller->StartAll();
   run_loop()->Run();
 
   EXPECT_EQ(popup_timers_controller->last_id(), "test2");
   EXPECT_TRUE(popup_timers_controller->timer_finished());
 }
 
 TEST_F(MessageCenterImplTest, PopupTimersControllerStartMultipleTimersPause) {
   std::unique_ptr<MockPopupTimersController> popup_timers_controller =
-      base::WrapUnique(
-          new MockPopupTimersController(message_center(), closure()));
+      base::MakeUnique<MockPopupTimersController>(message_center(), closure());
   popup_timers_controller->StartTimer("test",
                                       base::TimeDelta::FromMilliseconds(5));
   popup_timers_controller->StartTimer("test2",
                                       base::TimeDelta::FromMilliseconds(1));
   popup_timers_controller->StartTimer("test3",
                                       base::TimeDelta::FromMilliseconds(3));
   popup_timers_controller->PauseTimer("test2");
 
   run_loop()->Run();
 
   EXPECT_EQ(popup_timers_controller->last_id(), "test3");
   EXPECT_TRUE(popup_timers_controller->timer_finished());
 }
 
 TEST_F(MessageCenterImplTest, PopupTimersControllerResetTimer) {
   std::unique_ptr<MockPopupTimersController> popup_timers_controller =
-      base::WrapUnique(
-          new MockPopupTimersController(message_center(), closure()));
+      base::MakeUnique<MockPopupTimersController>(message_center(), closure());
   popup_timers_controller->StartTimer("test",
                                       base::TimeDelta::FromMilliseconds(5));
   popup_timers_controller->StartTimer("test2",
                                       base::TimeDelta::FromMilliseconds(1));
   popup_timers_controller->StartTimer("test3",
                                       base::TimeDelta::FromMilliseconds(3));
   popup_timers_controller->PauseTimer("test2");
   popup_timers_controller->ResetTimer("test",
                                       base::TimeDelta::FromMilliseconds(2));
 
@@ skipping 791 matching lines @@
   // Then open the message center.
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
 
   // Then update a notification; the update should have propagated.
   message_center()->RemoveNotification(id, false);
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(id));
 }
 
 }  // namespace internal
 }  // namespace message_center