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

Unified Diff: services/ui/ws/test_utils.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/server_window.cc ('k') | services/ui/ws/user_activity_monitor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/test_utils.cc
diff --git a/services/ui/ws/test_utils.cc b/services/ui/ws/test_utils.cc
index b361221494ac004be9975a254e54f405b3674289..6aac7a8c4a9eafaf25c422da27d87c5d27abcd96 100644
--- a/services/ui/ws/test_utils.cc
+++ b/services/ui/ws/test_utils.cc
@@ -407,7 +407,7 @@ 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) {
@@ -466,7 +466,7 @@ bool TestWindowServerDelegate::IsTestConfig() const {
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());
}
« no previous file with comments | « services/ui/ws/server_window.cc ('k') | services/ui/ws/user_activity_monitor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698