| Index: ash/accelerators/magnifier_key_scroller_unittest.cc
|
| diff --git a/ash/accelerators/magnifier_key_scroller_unittest.cc b/ash/accelerators/magnifier_key_scroller_unittest.cc
|
| index d24e9c343fb9cba3fecaf20f6c3955d2ae57eaa0..b624d5fa11e7c9e33cfaeb458d7b9c403723061e 100644
|
| --- a/ash/accelerators/magnifier_key_scroller_unittest.cc
|
| +++ b/ash/accelerators/magnifier_key_scroller_unittest.cc
|
| @@ -30,7 +30,7 @@ class KeyEventDelegate : public aura::test::TestWindowDelegate {
|
| void reset() { key_event.reset(); }
|
|
|
| private:
|
| - scoped_ptr<ui::KeyEvent> key_event;
|
| + std::unique_ptr<ui::KeyEvent> key_event;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(KeyEventDelegate);
|
| };
|
| @@ -41,10 +41,8 @@ typedef ash::test::AshTestBase MagnifierKeyScrollerTest;
|
|
|
| TEST_F(MagnifierKeyScrollerTest, Basic) {
|
| KeyEventDelegate delegate;
|
| - scoped_ptr<aura::Window> window(CreateTestWindowInShellWithDelegate(
|
| - &delegate,
|
| - 0,
|
| - gfx::Rect(10, 10, 100, 100)));
|
| + std::unique_ptr<aura::Window> window(CreateTestWindowInShellWithDelegate(
|
| + &delegate, 0, gfx::Rect(10, 10, 100, 100)));
|
| wm::ActivateWindow(window.get());
|
|
|
| MagnifierKeyScroller::ScopedEnablerForTest scoped;
|
|
|