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

Unified Diff: services/ui/ws/event_dispatcher_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/drag_controller_unittest.cc ('k') | services/ui/ws/focus_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/event_dispatcher_unittest.cc
diff --git a/services/ui/ws/event_dispatcher_unittest.cc b/services/ui/ws/event_dispatcher_unittest.cc
index e50afdb07d0ee4f79975b3770c1d682ce3804b1f..898d91b6061696101a6d05d675246f650aeed426 100644
--- a/services/ui/ws/event_dispatcher_unittest.cc
+++ b/services/ui/ws/event_dispatcher_unittest.cc
@@ -318,14 +318,16 @@ ServerWindow* EventDispatcherTest::GetActiveSystemModalWindow() const {
void EventDispatcherTest::SetUp() {
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);
- test_event_dispatcher_delegate_.reset(new TestEventDispatcherDelegate(this));
- event_dispatcher_.reset(
- new EventDispatcher(test_event_dispatcher_delegate_.get()));
+ test_event_dispatcher_delegate_ =
+ base::MakeUnique<TestEventDispatcherDelegate>(this);
+ event_dispatcher_ =
+ base::MakeUnique<EventDispatcher>(test_event_dispatcher_delegate_.get());
test_event_dispatcher_delegate_->set_root(root_window_.get());
}
« no previous file with comments | « services/ui/ws/drag_controller_unittest.cc ('k') | services/ui/ws/focus_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698