| Index: ui/views/test/views_test_helper_aura.h
|
| diff --git a/ui/views/test/views_test_helper_aura.h b/ui/views/test/views_test_helper_aura.h
|
| index 96a26eb24b0d5bec78cfb0be53209870ffc3f2f2..6dfcde6523b9287782187f2b4d018c849f6fe597 100644
|
| --- a/ui/views/test/views_test_helper_aura.h
|
| +++ b/ui/views/test/views_test_helper_aura.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_
|
| #define UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/views/test/views_test_helper.h"
|
|
|
| namespace aura {
|
| @@ -42,9 +43,9 @@ class ViewsTestHelperAura : public ViewsTestHelper {
|
|
|
| private:
|
| ui::ContextFactory* context_factory_;
|
| - scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
|
| - scoped_ptr<wm::WMState> wm_state_;
|
| - scoped_ptr<aura::client::ScreenPositionClient> screen_position_client_;
|
| + std::unique_ptr<aura::test::AuraTestHelper> aura_test_helper_;
|
| + std::unique_ptr<wm::WMState> wm_state_;
|
| + std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ViewsTestHelperAura);
|
| };
|
|
|