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

ui/wm/core/focus_controller_unittest.cc

Index: ui/wm/core/focus_controller_unittest.cc
diff --git a/ui/wm/core/focus_controller_unittest.cc b/ui/wm/core/focus_controller_unittest.cc
index 9302a55df72c33901f0db1353f34b8b5ba068471..c0786b7b558c9fe961341ef01b21e8b56c47fb52 100644
--- a/ui/wm/core/focus_controller_unittest.cc
+++ b/ui/wm/core/focus_controller_unittest.cc
@@ -844,7 +844,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase {
   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());
@@ -856,7 +856,7 @@ class FocusControllerDirectTestBase : public FocusControllerTestBase {
     // 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());