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

ui/wm/core/focus_controller_unittest.cc

 // Copyright (c) 2012 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/wm/core/focus_controller.h"
 
 #include <map>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 826 matching lines @@
       EXPECT_EQ(to_delete, observer1.GetDeletedWindow());
       EXPECT_FALSE(observer2.was_notified_with_deleted_window());
     }
   }
 
   // Test that the activation of the current active window will bring the window
   // to the top of the window stack.
   void StackWindowAtTopOnActivation() override {
     // Create a window, show it and then activate it.
     std::unique_ptr<aura::Window> window1 =
-        base::WrapUnique(new aura::Window(nullptr));
+        base::MakeUnique<aura::Window>(nullptr);
     window1->SetType(ui::wm::WINDOW_TYPE_NORMAL);
     window1->Init(ui::LAYER_TEXTURED);
     root_window()->AddChild(window1.get());
     window1->Show();
     ActivateWindow(window1.get());
     EXPECT_EQ(window1.get(), root_window()->children().back());
     EXPECT_EQ(window1.get(), GetActiveWindow());
 
     // Create another window, show it but don't activate it. The window is not
     // the active window but is placed on top of window stack.
     std::unique_ptr<aura::Window> window2 =
-        base::WrapUnique(new aura::Window(nullptr));
+        base::MakeUnique<aura::Window>(nullptr);
     window2->SetType(ui::wm::WINDOW_TYPE_NORMAL);
     window2->Init(ui::LAYER_TEXTURED);
     root_window()->AddChild(window2.get());
     window2->Show();
     EXPECT_EQ(window2.get(), root_window()->children().back());
     EXPECT_EQ(window1.get(), GetActiveWindow());
 
     // Try to reactivate the active window. It should bring the active window
     // to the top of the window stack.
     ActivateWindow(window1.get());
@@ skipping 451 matching lines @@
 FOCUS_CONTROLLER_TEST(FocusControllerApiTest, StackWindowAtTopOnActivation);
 
 // See description above TransientChildWindowActivationTest() for details.
 FOCUS_CONTROLLER_TEST(FocusControllerParentHideTest,
                       TransientChildWindowActivationTest);
 
 // If a mouse event was handled, it should not activate a window.
 FOCUS_CONTROLLER_TEST(FocusControllerMouseEventTest, IgnoreHandledEvent);
 
 }  // namespace wm