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

ui/display/chromeos/update_display_configuration_task_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 "ui/display/chromeos/update_display_configuration_task.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 390 matching lines @@
       JoinActions(kGrab, GetFramebufferAction(small_mode_.size(), &displays_[0],
                                               nullptr).c_str(),
                   GetCrtcAction(displays_[0], nullptr, gfx::Point()).c_str(),
                   kUngrab, NULL),
       log_.GetActionsAndClear());
 }
 
 TEST_F(UpdateDisplayConfigurationTaskTest, NoopSoftwareMirrorConfiguration) {
   layout_manager_.set_should_mirror(false);
   layout_manager_.set_software_mirroring_controller(
-      base::WrapUnique(new TestSoftwareMirroringController()));
+      base::MakeUnique<TestSoftwareMirroringController>());
   UpdateDisplays(2);
 
   {
     UpdateDisplayConfigurationTask task(
         &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED,
         chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
         base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
                    base::Unretained(this)));
     task.Run();
   }
@@ skipping 13 matching lines @@
   EXPECT_EQ(MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED, display_state_);
   EXPECT_TRUE(layout_manager_.GetSoftwareMirroringController()
               ->SoftwareMirroringEnabled());
   EXPECT_EQ(JoinActions(kGrab, kUngrab, NULL), log_.GetActionsAndClear());
 }
 
 TEST_F(UpdateDisplayConfigurationTaskTest,
        ForceConfigurationWhileGoingToSoftwareMirror) {
   layout_manager_.set_should_mirror(false);
   layout_manager_.set_software_mirroring_controller(
-      base::WrapUnique(new TestSoftwareMirroringController()));
+      base::MakeUnique<TestSoftwareMirroringController>());
   UpdateDisplays(2);
 
   {
     UpdateDisplayConfigurationTask task(
         &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED,
         chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
         base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
                    base::Unretained(this)));
     task.Run();
   }
@@ skipping 21 matching lines @@
                                       &displays_[0], &displays_[1]).c_str(),
           GetCrtcAction(displays_[0], &small_mode_, gfx::Point()).c_str(),
           GetCrtcAction(displays_[1], &big_mode_,
                         gfx::Point(0, small_mode_.size().height())).c_str(),
           kUngrab, NULL),
       log_.GetActionsAndClear());
 }
 
 }  // namespace test
 }  // namespace ui