| 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);
|
| };
|
|
|