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

Unified Diff: ui/views/test/scoped_views_test_helper.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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 | « ui/views/test/scoped_views_test_helper.h ('k') | ui/views/test/test_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/scoped_views_test_helper.cc
diff --git a/ui/views/test/scoped_views_test_helper.cc b/ui/views/test/scoped_views_test_helper.cc
index 3389f29239143507f12a0b941390a7a7230be0b2..539102970d3ff77ee0c43d2e0da34ca9fdd42339 100644
--- a/ui/views/test/scoped_views_test_helper.cc
+++ b/ui/views/test/scoped_views_test_helper.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "ui/base/ime/input_method_initializer.h"
#include "ui/compositor/test/context_factories_for_test.h"
@@ -16,11 +17,10 @@
namespace views {
ScopedViewsTestHelper::ScopedViewsTestHelper()
- : ScopedViewsTestHelper(make_scoped_ptr(new TestViewsDelegate)) {
-}
+ : ScopedViewsTestHelper(base::WrapUnique(new TestViewsDelegate)) {}
ScopedViewsTestHelper::ScopedViewsTestHelper(
- scoped_ptr<TestViewsDelegate> views_delegate)
+ std::unique_ptr<TestViewsDelegate> views_delegate)
: views_delegate_(std::move(views_delegate)),
platform_test_helper_(PlatformTestHelper::Create()) {
// The ContextFactory must exist before any Compositors are created.
« no previous file with comments | « ui/views/test/scoped_views_test_helper.h ('k') | ui/views/test/test_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698