| Index: ash/wm/immersive_fullscreen_controller_unittest.cc
|
| diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc
|
| index 7e1f1fb76dbfb601dbd56201c807b4c864efe267..f9991aa4dea946a4f9d319dd1e92e5fd1ff90b7d 100644
|
| --- a/ash/wm/immersive_fullscreen_controller_unittest.cc
|
| +++ b/ash/wm/immersive_fullscreen_controller_unittest.cc
|
| @@ -250,8 +250,8 @@ class ImmersiveFullscreenControllerTest : public ash::test::AshTestBase {
|
| }
|
| }
|
|
|
| - scoped_ptr<ImmersiveFullscreenController> controller_;
|
| - scoped_ptr<MockImmersiveFullscreenControllerDelegate> delegate_;
|
| + std::unique_ptr<ImmersiveFullscreenController> controller_;
|
| + std::unique_ptr<MockImmersiveFullscreenControllerDelegate> delegate_;
|
| views::Widget* widget_; // Owned by the native widget.
|
| views::View* top_container_; // Owned by |widget_|'s root-view.
|
| views::NativeViewHost* content_view_; // Owned by |widget_|'s root-view.
|
| @@ -290,8 +290,8 @@ TEST_F(ImmersiveFullscreenControllerTest, Delegate) {
|
|
|
| // GetRevealedLock() specific tests.
|
| TEST_F(ImmersiveFullscreenControllerTest, RevealedLock) {
|
| - scoped_ptr<ImmersiveRevealedLock> lock1;
|
| - scoped_ptr<ImmersiveRevealedLock> lock2;
|
| + std::unique_ptr<ImmersiveRevealedLock> lock1;
|
| + std::unique_ptr<ImmersiveRevealedLock> lock2;
|
|
|
| // Immersive fullscreen is not on by default.
|
| EXPECT_FALSE(controller()->IsEnabled());
|
| @@ -584,7 +584,7 @@ TEST_F(ImmersiveFullscreenControllerTest, MouseEventsVerticalDisplayLayout) {
|
| // Test behavior when the mouse becomes hovered without moving.
|
| TEST_F(ImmersiveFullscreenControllerTest, MouseHoveredWithoutMoving) {
|
| SetEnabled(true);
|
| - scoped_ptr<ImmersiveRevealedLock> lock;
|
| + std::unique_ptr<ImmersiveRevealedLock> lock;
|
|
|
| // 1) Test that if the mouse becomes hovered without the mouse moving due to a
|
| // lock causing the top-of-window views to be revealed (and the mouse
|
| @@ -694,7 +694,7 @@ TEST_F(ImmersiveFullscreenControllerTest, MAYBE_EndRevealViaGesture) {
|
| // If some other code is holding onto a lock, a gesture should not be able to
|
| // end the reveal.
|
| AttemptReveal(MODALITY_MOUSE);
|
| - scoped_ptr<ImmersiveRevealedLock> lock(controller()->GetRevealedLock(
|
| + std::unique_ptr<ImmersiveRevealedLock> lock(controller()->GetRevealedLock(
|
| ImmersiveFullscreenController::ANIMATE_REVEAL_NO));
|
| EXPECT_TRUE(controller()->IsRevealed());
|
| AttemptUnreveal(MODALITY_GESTURE_SCROLL);
|
| @@ -712,11 +712,9 @@ TEST_F(ImmersiveFullscreenControllerTest, RevealViaGestureChildConsumesEvents) {
|
| EXPECT_FALSE(controller()->IsRevealed());
|
|
|
| aura::test::TestWindowDelegate child_delegate;
|
| - scoped_ptr<aura::Window> child(
|
| - CreateTestWindowInShellWithDelegateAndType(&child_delegate,
|
| - ui::wm::WINDOW_TYPE_CONTROL,
|
| - 1234,
|
| - gfx::Rect()));
|
| + std::unique_ptr<aura::Window> child(
|
| + CreateTestWindowInShellWithDelegateAndType(
|
| + &child_delegate, ui::wm::WINDOW_TYPE_CONTROL, 1234, gfx::Rect()));
|
| content_view()->Attach(child.get());
|
| child->Show();
|
|
|
| @@ -740,7 +738,7 @@ TEST_F(ImmersiveFullscreenControllerTest, RevealViaGestureChildConsumesEvents) {
|
| TEST_F(ImmersiveFullscreenControllerTest, EventsDoNotLeakToWindowUnderneath) {
|
| gfx::Rect window_bounds = window()->GetBoundsInScreen();
|
| aura::test::TestWindowDelegate child_delegate;
|
| - scoped_ptr<aura::Window> behind(CreateTestWindowInShellWithDelegate(
|
| + std::unique_ptr<aura::Window> behind(CreateTestWindowInShellWithDelegate(
|
| &child_delegate, 1234, window_bounds));
|
| behind->Show();
|
| behind->SetBounds(window_bounds);
|
| @@ -840,7 +838,7 @@ TEST_F(ImmersiveFullscreenControllerTest, Focus) {
|
| child_view->RequestFocus();
|
| EXPECT_TRUE(controller()->IsRevealed());
|
| SetEnabled(false);
|
| - scoped_ptr<ImmersiveRevealedLock> lock(controller()->GetRevealedLock(
|
| + std::unique_ptr<ImmersiveRevealedLock> lock(controller()->GetRevealedLock(
|
| ImmersiveFullscreenController::ANIMATE_REVEAL_NO));
|
| EXPECT_FALSE(controller()->IsRevealed());
|
| unrelated_view->RequestFocus();
|
| @@ -866,7 +864,7 @@ TEST_F(ImmersiveFullscreenControllerTest, Transient) {
|
| views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
|
| transient_params.parent = top_container_widget->GetNativeView();
|
| transient_params.bounds = gfx::Rect(0, 100, 100, 100);
|
| - scoped_ptr<views::Widget> transient_widget(new views::Widget());
|
| + std::unique_ptr<views::Widget> transient_widget(new views::Widget());
|
| transient_widget->Init(transient_params);
|
|
|
| EXPECT_FALSE(controller()->IsRevealed());
|
| @@ -885,7 +883,7 @@ TEST_F(ImmersiveFullscreenControllerTest, Transient) {
|
| views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
|
| non_transient_params.context = top_container_widget->GetNativeView();
|
| non_transient_params.bounds = gfx::Rect(0, 100, 100, 100);
|
| - scoped_ptr<views::Widget> non_transient_widget(new views::Widget());
|
| + std::unique_ptr<views::Widget> non_transient_widget(new views::Widget());
|
| non_transient_widget->Init(non_transient_params);
|
|
|
| EXPECT_FALSE(controller()->IsRevealed());
|
| @@ -898,7 +896,7 @@ TEST_F(ImmersiveFullscreenControllerTest, Transient) {
|
|
|
| // Test how bubbles affect whether the top-of-window views are revealed.
|
| TEST_F(ImmersiveFullscreenControllerTest, Bubbles) {
|
| - scoped_ptr<ImmersiveRevealedLock> revealed_lock;
|
| + std::unique_ptr<ImmersiveRevealedLock> revealed_lock;
|
| views::Widget* top_container_widget = top_container()->GetWidget();
|
|
|
| // Add views to the view hierarchy to which we will anchor bubbles.
|
|
|