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

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

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/platform_test_helper.h ('k') | ui/views/test/scoped_views_test_helper.cc » ('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.h
diff --git a/ui/views/test/scoped_views_test_helper.h b/ui/views/test/scoped_views_test_helper.h
index 7bcd78133f288aeb4bb582c397425d18d9661bed..2b30a3395ffd87ce97748795207e9d9cc6784160 100644
--- a/ui/views/test/scoped_views_test_helper.h
+++ b/ui/views/test/scoped_views_test_helper.h
@@ -5,8 +5,9 @@
#ifndef UI_VIEWS_TEST_SCOPED_VIEWS_TEST_HELPER_H_
#define UI_VIEWS_TEST_SCOPED_VIEWS_TEST_HELPER_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/gfx/native_widget_types.h"
namespace views {
@@ -27,7 +28,8 @@ class ScopedViewsTestHelper {
// Initialize with the given TestViewsDelegate instance, after setting the
// ContextFactory.
- explicit ScopedViewsTestHelper(scoped_ptr<TestViewsDelegate> views_delegate);
+ explicit ScopedViewsTestHelper(
+ std::unique_ptr<TestViewsDelegate> views_delegate);
~ScopedViewsTestHelper();
@@ -40,9 +42,9 @@ class ScopedViewsTestHelper {
bool IsMus() const;
private:
- scoped_ptr<TestViewsDelegate> views_delegate_;
- scoped_ptr<ViewsTestHelper> test_helper_;
- scoped_ptr<PlatformTestHelper> platform_test_helper_;
+ std::unique_ptr<TestViewsDelegate> views_delegate_;
+ std::unique_ptr<ViewsTestHelper> test_helper_;
+ std::unique_ptr<PlatformTestHelper> platform_test_helper_;
DISALLOW_COPY_AND_ASSIGN(ScopedViewsTestHelper);
};
« no previous file with comments | « ui/views/test/platform_test_helper.h ('k') | ui/views/test/scoped_views_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698