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

services/ui/ws/drag_controller_unittest.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/drag_controller.h"
 
 #include "services/ui/ws/drag_source.h"
 #include "services/ui/ws/drag_target_connection.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/server_window.h"
@@ skipping 126 matching lines @@
     server_window_by_id_[id] = p->window();
     connection_by_window_[p->window()] = p.get();
     return p;
   }
 
   void StartDragOperation(
       mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data,
       DragTestWindow* window,
       uint32_t drag_operations) {
     window->PerformOnDragDropStart(mime_data.Clone());
-    drag_operation_.reset(new DragController(
+    drag_operation_ = base::MakeUnique<DragController>(
         this, window->window(), window, PointerEvent::kMousePointerId,
-        std::move(mime_data), drag_operations));
+        std::move(mime_data), drag_operations);
   }
 
   void DispatchDrag(DragTestWindow* window,
                     bool mouse_released,
                     uint32_t flags,
                     const gfx::Point& position) {
     ui::PointerEvent event(
         ui::MouseEvent(mouse_released ? ET_MOUSE_RELEASED : ET_MOUSE_PRESSED,
                        position, position, ui::EventTimeForNow(), flags, 0));
     drag_operation_->DispatchPointerEvent(event,
@@ skipping 25 matching lines @@
   }
   const base::Optional<bool>& drag_completed_value() {
     return drag_completed_value_;
   }
 
  private:
   // Overridden from testing::Test:
   void SetUp() override {
     testing::Test::SetUp();
 
-    window_delegate_.reset(new TestServerWindowDelegate());
-    root_window_.reset(
-        new ServerWindow(window_delegate_.get(), WindowId(1, 2)));
+    window_delegate_ = base::MakeUnique<TestServerWindowDelegate>();
+    root_window_ =
+        base::MakeUnique<ServerWindow>(window_delegate_.get(), WindowId(1, 2));
     window_delegate_->set_root_window(root_window_.get());
     root_window_->SetVisible(true);
   }
 
   void TearDown() override {
     drag_operation_.reset();
     root_window_.reset();
     window_delegate_.reset();
 
     DCHECK(server_window_by_id_.empty());
@@ skipping 400 matching lines @@
                           gfx::Point(1, 1));
   ASSERT_EQ(0u, window->queue_size());
 }
 
 // TODO(erg): Add a test to ensure windows that the cursor isn't over
 // responding to messages don't change the cursor when we have cursor handling
 // code.
 
 }  // namespace ws
 }  // namespace ui