mus ws: Move 'reset(new' to base::MakeUnique.

services/ui/ws/test_utils.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/test_utils.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 389 matching lines @@
     WindowTree* tree,
     std::unique_ptr<TestWindowTreeClient> client)
     : WindowTreeBinding(client.get()),
       tree_(tree),
       client_(std::move(client)) {}
 
 TestWindowTreeBinding::~TestWindowTreeBinding() {}
 
 mojom::WindowManager* TestWindowTreeBinding::GetWindowManager() {
   if (!window_manager_.get())
-    window_manager_.reset(new TestWindowManager);
+    window_manager_ = base::MakeUnique<TestWindowManager>();
   return window_manager_.get();
 }
 void TestWindowTreeBinding::SetIncomingMethodCallProcessingPaused(bool paused) {
   is_paused_ = paused;
 }
 
 mojom::WindowTreeClient* TestWindowTreeBinding::CreateClientForShutdown() {
   DCHECK(!client_after_reset_);
   client_after_reset_ = base::MakeUnique<TestWindowTreeClient>();
   return client_after_reset_.get();
@@ skipping 38 matching lines @@
 
 bool TestWindowServerDelegate::IsTestConfig() const {
   return true;
 }
 
 // WindowServerTestHelper  ---------------------------------------------------
 
 WindowServerTestHelper::WindowServerTestHelper()
     : cursor_id_(0), platform_display_factory_(&cursor_id_) {
   PlatformDisplay::set_factory_for_testing(&platform_display_factory_);
-  window_server_.reset(new WindowServer(&window_server_delegate_));
+  window_server_ = base::MakeUnique<WindowServer>(&window_server_delegate_);
   window_server_delegate_.set_window_server(window_server_.get());
 }
 
 WindowServerTestHelper::~WindowServerTestHelper() {
   // Destroy |window_server_| while the message-loop is still alive.
   window_server_.reset();
 }
 
 // WindowEventTargetingHelper ------------------------------------------------
 
@@ skipping 116 matching lines @@
     return nullptr;
   if (!tree->AddWindow(parent_client_id, client_window_id))
     return nullptr;
   *client_id = client_window_id;
   return tree->GetWindowByClientId(client_window_id);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui