| Index: ui/views/test/views_test_helper_mac.h
|
| diff --git a/ui/views/test/views_test_helper_mac.h b/ui/views/test/views_test_helper_mac.h
|
| index 34f5b3555975247d528f15648e8243591756c5dc..d30737261a85e2f66ba0b0f047d1e2ad6ce5f3b2 100644
|
| --- a/ui/views/test/views_test_helper_mac.h
|
| +++ b/ui/views/test/views_test_helper_mac.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef UI_VIEWS_TEST_VIEWS_TEST_HELPER_MAC_H_
|
| #define UI_VIEWS_TEST_VIEWS_TEST_HELPER_MAC_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/views/test/views_test_helper.h"
|
|
|
| namespace ui {
|
| @@ -30,20 +31,20 @@ class ViewsTestHelperMac : public ViewsTestHelper {
|
|
|
| private:
|
| // Disable animations during tests.
|
| - scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
|
| + std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
|
|
|
| // When using desktop widgets on Mac, window activation is asynchronous
|
| // because the window server is involved. A window may also be deactivated by
|
| // a test running in parallel, making it flaky. In non-interactive/sharded
|
| // tests, |faked_focus_| is initialized, permitting a unit test to "fake" this
|
| // activation, causing it to be synchronous and per-process instead.
|
| - scoped_ptr<ui::test::ScopedFakeNSWindowFocus> faked_focus_;
|
| + std::unique_ptr<ui::test::ScopedFakeNSWindowFocus> faked_focus_;
|
|
|
| // Toggling fullscreen mode on Mac can be flaky for tests run in parallel
|
| // because only one window may be animating into or out of fullscreen at a
|
| // time. In non-interactive/sharded tests, |faked_fullscreen_| is initialized,
|
| // permitting a unit test to 'fake' toggling fullscreen mode.
|
| - scoped_ptr<ui::test::ScopedFakeNSWindowFullscreen> faked_fullscreen_;
|
| + std::unique_ptr<ui::test::ScopedFakeNSWindowFullscreen> faked_fullscreen_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ViewsTestHelperMac);
|
| };
|
|
|