Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Unified Diff: services/ui/ws/drag_controller_unittest.cc

Issue 2365753003: mus ws: Move 'reset(new' to base::MakeUnique. (Closed)
Patch Set: Merge with tot Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/ui/ws/display.cc ('k') | services/ui/ws/event_dispatcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/drag_controller_unittest.cc
diff --git a/services/ui/ws/drag_controller_unittest.cc b/services/ui/ws/drag_controller_unittest.cc
index af0b94de7cdf4f7ee5ce96bb4b6b4db635c9a001..8b9360d87046d40ddb2a7d0b46022443e730bed7 100644
--- a/services/ui/ws/drag_controller_unittest.cc
+++ b/services/ui/ws/drag_controller_unittest.cc
@@ -144,9 +144,9 @@ class DragControllerTest : public testing::Test, public DragSource {
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,
@@ -192,9 +192,9 @@ class DragControllerTest : public testing::Test, public DragSource {
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);
}
« no previous file with comments | « services/ui/ws/display.cc ('k') | services/ui/ws/event_dispatcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698