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

components/mus/ws/window_tree_unittest.cc

 // 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.
 
+#include "components/mus/ws/window_tree.h"
+
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "components/mus/common/types.h"
 #include "components/mus/common/util.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/surfaces/surfaces_state.h"
 #include "components/mus/ws/default_access_policy.h"
 #include "components/mus/ws/display_binding.h"
 #include "components/mus/ws/ids.h"
 #include "components/mus/ws/platform_display.h"
 #include "components/mus/ws/platform_display_factory.h"
 #include "components/mus/ws/platform_display_init_params.h"
 #include "components/mus/ws/server_window.h"
 #include "components/mus/ws/server_window_surface_manager_test_api.h"
 #include "components/mus/ws/test_change_tracker.h"
 #include "components/mus/ws/test_server_window_delegate.h"
 #include "components/mus/ws/test_utils.h"
 #include "components/mus/ws/window_manager_access_policy.h"
 #include "components/mus/ws/window_server.h"
 #include "components/mus/ws/window_server_delegate.h"
-#include "components/mus/ws/window_tree.h"
 #include "components/mus/ws/window_tree_binding.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mus {
 namespace ws {
@@ skipping 99 matching lines @@
   // Creates a new window from wm_tree() and embeds a new connection in
   // it.
   void SetupEventTargeting(TestWindowTreeClient** out_client,
                            WindowTree** window_tree,
                            ServerWindow** window);
 
   // Creates a new tree as the specified user. This does what creation via
   // a WindowTreeFactory does.
   WindowTree* CreateNewTree(const UserId& user_id,
                             TestWindowTreeBinding** binding) {
-    WindowTree* tree = new WindowTree(window_server_.get(), user_id, nullptr,
-                                      make_scoped_ptr(new DefaultAccessPolicy));
+    WindowTree* tree =
+        new WindowTree(window_server_.get(), user_id, nullptr,
+                       base::WrapUnique(new DefaultAccessPolicy));
     *binding = new TestWindowTreeBinding(tree);
-    window_server_->AddTree(make_scoped_ptr(tree), make_scoped_ptr(*binding),
+    window_server_->AddTree(base::WrapUnique(tree), base::WrapUnique(*binding),
                             nullptr);
     return tree;
   }
 
  protected:
   // testing::Test:
   void SetUp() override {
     PlatformDisplay::set_factory_for_testing(&platform_display_factory_);
     window_server_.reset(new WindowServer(&delegate_, surfaces_state_));
     PlatformDisplayInitParams display_init_params;
     display_init_params.surfaces_state = surfaces_state_;
     display_ = new Display(window_server_.get(), display_init_params);
     display_binding_ = new TestDisplayBinding(display_, window_server_.get());
-    display_->Init(make_scoped_ptr(display_binding_));
+    display_->Init(base::WrapUnique(display_binding_));
     wm_client_ = delegate_.last_client();
   }
 
  protected:
   // TestWindowTreeClient that is used for the WM connection.
   TestWindowTreeClient* wm_client_;
   int32_t cursor_id_;
   TestPlatformDisplayFactory platform_display_factory_;
   TestWindowServerDelegate delegate_;
   // Owned by WindowServer.
   TestDisplayBinding* display_binding_;
   Display* display_ = nullptr;
   scoped_refptr<SurfacesState> surfaces_state_;
-  scoped_ptr<WindowServer> window_server_;
+  std::unique_ptr<WindowServer> window_server_;
   base::MessageLoop message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeTest);
 };
 
 // Creates a new window in wm_tree(), adds it to the root, embeds a
 // new client in the window and creates a child of said window. |window| is
 // set to the child of |window_tree| that is created.
 void WindowTreeTest::SetupEventTargeting(TestWindowTreeClient** out_client,
                                          WindowTree** window_tree,
@@ skipping 679 matching lines @@
   ASSERT_NE(new_opacity, unknown_window.opacity());
 
   EXPECT_FALSE(tree->SetWindowOpacity(
       ClientWindowId(WindowIdToTransportId(window_id)), new_opacity));
   EXPECT_NE(new_opacity, unknown_window.opacity());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus