| Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
|
| diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
|
| index 446a00053f70411ca85297a65fab7134f226f02e..5752a3df4a18e7206f9f8a71eafb3ff0a20bdf97 100644
|
| --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
|
| +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
|
| @@ -80,7 +80,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest,
|
| // fullscreen here because tab fullscreen is non-immersive even on ChromeOS).
|
| {
|
| // NOTIFICATION_FULLSCREEN_CHANGED is sent asynchronously.
|
| - scoped_ptr<FullscreenNotificationObserver> waiter(
|
| + std::unique_ptr<FullscreenNotificationObserver> waiter(
|
| new FullscreenNotificationObserver());
|
| browser()
|
| ->exclusive_access_manager()
|
| @@ -97,7 +97,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest,
|
| // The frame should be painted again when fullscreen is exited and the caption
|
| // buttons should be visible.
|
| {
|
| - scoped_ptr<FullscreenNotificationObserver> waiter(
|
| + std::unique_ptr<FullscreenNotificationObserver> waiter(
|
| new FullscreenNotificationObserver());
|
| chrome::ToggleFullscreenMode(browser());
|
| waiter->Wait();
|
| @@ -134,13 +134,13 @@ IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest, ImmersiveFullscreen) {
|
| // fullscreen should enable immersive fullscreen.
|
| {
|
| // NOTIFICATION_FULLSCREEN_CHANGED is sent asynchronously.
|
| - scoped_ptr<FullscreenNotificationObserver> waiter(
|
| + std::unique_ptr<FullscreenNotificationObserver> waiter(
|
| new FullscreenNotificationObserver());
|
| chrome::ToggleFullscreenMode(browser());
|
| waiter->Wait();
|
| }
|
| {
|
| - scoped_ptr<FullscreenNotificationObserver> waiter(
|
| + std::unique_ptr<FullscreenNotificationObserver> waiter(
|
| new FullscreenNotificationObserver());
|
| browser()
|
| ->exclusive_access_manager()
|
| @@ -151,7 +151,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest, ImmersiveFullscreen) {
|
| EXPECT_TRUE(immersive_mode_controller->IsEnabled());
|
|
|
| // An immersive reveal shows the buttons and the top of the frame.
|
| - scoped_ptr<ImmersiveRevealedLock> revealed_lock(
|
| + std::unique_ptr<ImmersiveRevealedLock> revealed_lock(
|
| immersive_mode_controller->GetRevealedLock(
|
| ImmersiveModeController::ANIMATE_REVEAL_NO));
|
| EXPECT_TRUE(immersive_mode_controller->IsRevealed());
|
| @@ -169,7 +169,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest, ImmersiveFullscreen) {
|
| // Repeat test but without tab fullscreen. The tab lightbars should now show
|
| // when the top-of-window views are not revealed.
|
| {
|
| - scoped_ptr<FullscreenNotificationObserver> waiter(
|
| + std::unique_ptr<FullscreenNotificationObserver> waiter(
|
| new FullscreenNotificationObserver());
|
| browser()
|
| ->exclusive_access_manager()
|
| @@ -200,7 +200,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest, ImmersiveFullscreen) {
|
| // Exiting immersive fullscreen should make the caption buttons and the frame
|
| // visible again.
|
| {
|
| - scoped_ptr<FullscreenNotificationObserver> waiter(
|
| + std::unique_ptr<FullscreenNotificationObserver> waiter(
|
| new FullscreenNotificationObserver());
|
| browser_view->ExitFullscreen();
|
| waiter->Wait();
|
|
|