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

components/mus/ws/display.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_MUS_WS_DISPLAY_H_
 #define COMPONENTS_MUS_WS_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <map>
+#include <memory>
 #include <queue>
 
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/interfaces/window_manager_constants.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "components/mus/ws/focus_controller_delegate.h"
 #include "components/mus/ws/focus_controller_observer.h"
 #include "components/mus/ws/platform_display.h"
 #include "components/mus/ws/server_window.h"
 #include "components/mus/ws/server_window_observer.h"
 #include "components/mus/ws/server_window_tracker.h"
@@ skipping 30 matching lines @@
                 public FocusControllerDelegate,
                 public ServerWindowObserver,
                 public UserIdTrackerObserver,
                 public WindowManagerFactoryRegistryObserver {
  public:
   Display(WindowServer* window_server,
           const PlatformDisplayInitParams& platform_display_init_params);
   ~Display() override;
 
   // Initializes state that depends on the existence of a Display.
-  void Init(scoped_ptr<DisplayBinding> binding);
+  void Init(std::unique_ptr<DisplayBinding> binding);
 
   uint32_t id() const { return id_; }
 
   DisplayManager* display_manager();
   const DisplayManager* display_manager() const;
 
   // Returns a mojom::Display for the specified display. WindowManager specific
   // values are not set. In general you should use
   // WindowManagerState::ToMojomDisplay().
   mojom::DisplayPtr ToMojomDisplay() const;
@@ skipping 70 matching lines @@
   void MaybeChangeCursorOnWindowTreeChange();
 
   // mojom::WindowTreeHost:
   void SetSize(mojo::SizePtr size) override;
   void SetTitle(const mojo::String& title) override;
 
  private:
   friend class test::DisplayTestApi;
 
   using WindowManagerStateMap =
-      std::map<UserId, scoped_ptr<WindowManagerState>>;
+      std::map<UserId, std::unique_ptr<WindowManagerState>>;
 
   // Inits the necessary state once the display is ready.
   void InitWindowManagersIfNecessary();
 
   // Creates the set of WindowManagerStates from the
   // WindowManagerFactoryRegistry.
   void CreateWindowManagerStatesFromRegistry();
 
   void CreateWindowManagerStateFromService(
       WindowManagerFactoryService* service);
@@ skipping 25 matching lines @@
   // UserIdTrackerObserver:
   void OnActiveUserIdChanged(const UserId& previously_active_id,
                              const UserId& active_id) override;
   void OnUserIdAdded(const UserId& id) override;
   void OnUserIdRemoved(const UserId& id) override;
 
   // WindowManagerFactoryRegistryObserver:
   void OnWindowManagerFactorySet(WindowManagerFactoryService* service) override;
 
   const uint32_t id_;
-  scoped_ptr<DisplayBinding> binding_;
+  std::unique_ptr<DisplayBinding> binding_;
   // Set once Init() has been called.
   bool init_called_ = false;
   WindowServer* const window_server_;
-  scoped_ptr<ServerWindow> root_;
-  scoped_ptr<PlatformDisplay> platform_display_;
-  scoped_ptr<FocusController> focus_controller_;
+  std::unique_ptr<ServerWindow> root_;
+  std::unique_ptr<PlatformDisplay> platform_display_;
+  std::unique_ptr<FocusController> focus_controller_;
 
   // The last cursor set. Used to track whether we need to change the cursor.
   int32_t last_cursor_;
 
   ServerWindowTracker activation_parents_;
 
   // Set of windows with surfaces that need to be destroyed once the frame
   // draws.
   std::set<ServerWindow*> windows_needing_frame_destruction_;
 
   WindowManagerStateMap window_manager_state_map_;
 
   cc::SurfaceId top_level_surface_id_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_DISPLAY_H_