Index: ui/views/test/views_test_base.h |
diff --git a/ui/views/test/views_test_base.h b/ui/views/test/views_test_base.h |
index 1a60ac938c364c0efd3627b3726e4ac8fe6638df..c1e5c942f6b72f0490687a2a99db27fd1431977a 100644 |
--- a/ui/views/test/views_test_base.h |
+++ b/ui/views/test/views_test_base.h |
@@ -5,8 +5,9 @@ |
#ifndef UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ |
#define UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/message_loop/message_loop.h" |
#include "build/build_config.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -49,7 +50,7 @@ class ViewsTestBase : public PlatformTest { |
return test_helper_->views_delegate(); |
} |
- void set_views_delegate(scoped_ptr<TestViewsDelegate> views_delegate) { |
+ void set_views_delegate(std::unique_ptr<TestViewsDelegate> views_delegate) { |
DCHECK(!setup_called_); |
views_delegate_for_setup_.swap(views_delegate); |
} |
@@ -62,8 +63,8 @@ class ViewsTestBase : public PlatformTest { |
private: |
base::MessageLoopForUI message_loop_; |
- scoped_ptr<TestViewsDelegate> views_delegate_for_setup_; |
- scoped_ptr<ScopedViewsTestHelper> test_helper_; |
+ std::unique_ptr<TestViewsDelegate> views_delegate_for_setup_; |
+ std::unique_ptr<ScopedViewsTestHelper> test_helper_; |
bool setup_called_; |
bool teardown_called_; |