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

components/mus/mus_app.h

 // Copyright 2014 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_MUS_APP_H_
 #define COMPONENTS_MUS_MUS_APP_H_
 
 #include <stdint.h>
 
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "components/mus/public/interfaces/display.mojom.h"
 #include "components/mus/public/interfaces/gpu.mojom.h"
 #include "components/mus/public/interfaces/user_access_manager.mojom.h"
 #include "components/mus/public/interfaces/window_manager_factory.mojom.h"
 #include "components/mus/public/interfaces/window_server_test.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "components/mus/ws/platform_display_init_params.h"
 #include "components/mus/ws/user_id.h"
 #include "components/mus/ws/window_server_delegate.h"
@@ skipping 33 matching lines @@
  public:
   MandolineUIServicesApp();
   ~MandolineUIServicesApp() override;
 
  private:
   // Holds InterfaceRequests received before the first WindowTreeHost Display
   // has been established.
   struct PendingRequest;
   struct UserState;
 
-  using UserIdToUserState = std::map<ws::UserId, scoped_ptr<UserState>>;
+  using UserIdToUserState = std::map<ws::UserId, std::unique_ptr<UserState>>;
 
   void InitializeResources(shell::Connector* connector);
 
   // Returns the user specific state for the user id of |connection|. MusApp
   // owns the return value.
   // TODO(sky): if we allow removal of user ids then we need to close anything
   // associated with the user (all incoming pipes...) on removal.
   UserState* GetUserState(shell::Connection* connection);
 
   void AddUserIfNecessary(shell::Connection* connection);
@@ skipping 32 matching lines @@
 
   // shell::InterfaceFactory<mojom::WindowServerTest> implementation.
   void Create(shell::Connection* connection,
               mojom::WindowServerTestRequest request) override;
 
   // shell::InterfaceFactory<mojom::Gpu> implementation.
   void Create(shell::Connection* connection,
               mojom::GpuRequest request) override;
 
   ws::PlatformDisplayInitParams platform_display_init_params_;
-  scoped_ptr<ws::WindowServer> window_server_;
-  scoped_ptr<ui::PlatformEventSource> event_source_;
+  std::unique_ptr<ws::WindowServer> window_server_;
+  std::unique_ptr<ui::PlatformEventSource> event_source_;
   mojo::TracingImpl tracing_;
-  using PendingRequests = std::vector<scoped_ptr<PendingRequest>>;
+  using PendingRequests = std::vector<std::unique_ptr<PendingRequest>>;
   PendingRequests pending_requests_;
 
   UserIdToUserState user_id_to_user_state_;
 
   bool test_config_;
 #if defined(USE_OZONE)
-  scoped_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
+  std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(MandolineUIServicesApp);
 };
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_MUS_APP_H_