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

ash/mus/root_window_controller.cc

 // Copyright 2016 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 "ash/mus/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 189 matching lines @@
       GetWindowByShellWindowId(kShellWindowId_DefaultContainer);
   // WorkspaceLayoutManager is not a mash::wm::LayoutManager (it's a
   // wm::LayoutManager), so it can't be in |layout_managers_|.
   workspace_layout_manager_ = new WorkspaceLayoutManager(default_container);
   default_container->SetLayoutManager(
       base::WrapUnique(workspace_layout_manager_));
 
   WmWindowMus* docked_container =
       GetWindowByShellWindowId(kShellWindowId_DockedContainer);
   docked_container->SetLayoutManager(
-      base::WrapUnique(new DockedWindowLayoutManager(docked_container)));
+      base::MakeUnique<DockedWindowLayoutManager>(docked_container));
 
   WmWindowMus* panel_container =
       GetWindowByShellWindowId(kShellWindowId_PanelContainer);
   panel_container->SetLayoutManager(
-      base::WrapUnique(new PanelLayoutManager(panel_container)));
+      base::MakeUnique<PanelLayoutManager>(panel_container));
 }
 
 void RootWindowController::CreateStatusArea() {
   WmWindowMus* status_container =
       GetWindowByShellWindowId(kShellWindowId_StatusContainer);
   // Owned by native widget.
   StatusAreaWidget* status_area_widget =
       new StatusAreaWidget(status_container, wm_shelf_.get());
   status_area_widget->CreateTrayViews();
   // TODO(jamescook): Remove this when ash::StatusAreaLayoutManager and
   // ash::ShelfLayoutManager are working in mash. http://crbug.com/621112
   gfx::Size display_size = display_.bounds().size();
   status_area_widget->SetBounds(gfx::Rect(display_size.width() - 179,
                                           display_size.height() - 48, 120, 40));
   if (WmShell::Get()->GetSessionStateDelegate()->IsActiveUserSessionStarted())
     status_area_widget->Show();
 }
 
 }  // namespace mus
 }  // namespace ash