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

services/ui/ws/modal_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 "services/ui/ws/modal_window_controller.h"
 
 #include "base/stl_util.h"
 #include "services/ui/ws/event_dispatcher.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_drawn_tracker.h"
@@ skipping 32 matching lines @@
   }
 }
 
 void ModalWindowController::AddSystemModalWindow(ServerWindow* window) {
   DCHECK(window);
   DCHECK(!base::ContainsValue(system_modal_windows_, window));
 
   window->SetModal();
   system_modal_windows_.push_back(window);
   window_drawn_trackers_.insert(make_pair(
-      window, base::WrapUnique(new ServerWindowDrawnTracker(window, this))));
+      window, base::MakeUnique<ServerWindowDrawnTracker>(window, this)));
   window->AddObserver(this);
 
   event_dispatcher_->ReleaseCaptureBlockedByModalWindow(window);
 }
 
 bool ModalWindowController::IsWindowBlockedBy(
     const ServerWindow* window,
     const ServerWindow* modal_window) const {
   DCHECK(window);
   DCHECK(modal_window);
@@ skipping 48 matching lines @@
   // Move the most recently shown window to the end of the list.
   auto it = std::find(system_modal_windows_.begin(),
                       system_modal_windows_.end(), window);
   DCHECK(it != system_modal_windows_.end());
   system_modal_windows_.splice(system_modal_windows_.end(),
                                system_modal_windows_, it);
 }
 
 }  // namespace ws
 }  // namespace ui