Convert //components/mus from scoped_ptr to std::unique_ptr

components/mus/ws/display_manager.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 "components/mus/ws/display_manager.h"
 
+#include "base/memory/ptr_util.h"
 #include "components/mus/ws/display.h"
 #include "components/mus/ws/display_manager_delegate.h"
 #include "components/mus/ws/server_window.h"
 #include "components/mus/ws/user_display_manager.h"
 
 namespace mus {
 namespace ws {
 
 DisplayManager::DisplayManager(DisplayManagerDelegate* delegate)
     // |next_root_id_| is used as the lower bits, so that starting at 0 is
     // fine. |next_display_id_| is used by itself, so we start at 1 to reserve
     // 0 as invalid.
     : delegate_(delegate),
       next_root_id_(0),
       next_display_id_(1) {}
 
 DisplayManager::~DisplayManager() {
   DestroyAllDisplays();
 }
 
 UserDisplayManager* DisplayManager::GetUserDisplayManager(
     const UserId& user_id) {
   if (!user_display_managers_.count(user_id)) {
     user_display_managers_[user_id] =
-        make_scoped_ptr(new UserDisplayManager(this, user_id));
+        base::WrapUnique(new UserDisplayManager(this, user_id));
   }
   return user_display_managers_[user_id].get();
 }
 
 void DisplayManager::AddDisplay(Display* display) {
   DCHECK_EQ(0u, pending_displays_.count(display));
   pending_displays_.insert(display);
 }
 
 void DisplayManager::DestroyDisplay(Display* display) {
@@ skipping 95 matching lines @@
   DCHECK_EQ(0u, displays_.count(display));
   const bool is_first_display = displays_.empty();
   displays_.insert(display);
   pending_displays_.erase(display);
   if (is_first_display)
     delegate_->OnFirstDisplayReady();
 }
 
 }  // namespace ws
 }  // namespace mus