| Index: ash/system/chromeos/brightness/tray_brightness_unittest.cc
|
| diff --git a/ash/system/chromeos/brightness/tray_brightness_unittest.cc b/ash/system/chromeos/brightness/tray_brightness_unittest.cc
|
| index d58aa7385c829cf7057373fc5f28ba490fe35953..01fcb3a0ef393aba948ef1204a4e5d55044aa22c 100644
|
| --- a/ash/system/chromeos/brightness/tray_brightness_unittest.cc
|
| +++ b/ash/system/chromeos/brightness/tray_brightness_unittest.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "ash/system/chromeos/brightness/tray_brightness.h"
|
|
|
| +#include <memory>
|
| +
|
| #include "ash/shell.h"
|
| #include "ash/system/tray/system_tray_delegate.h"
|
| #include "ash/system/tray/system_tray_item.h"
|
| @@ -39,7 +41,7 @@ class TrayBrightnessTest : public test::AshTestBase {
|
| // Tests that when the default view is initially created, that its
|
| // BrightnessView is created not visible.
|
| TEST_F(TrayBrightnessTest, CreateDefaultView) {
|
| - scoped_ptr<views::View> tray(CreateDefaultView());
|
| + std::unique_ptr<views::View> tray(CreateDefaultView());
|
| EXPECT_FALSE(tray->visible());
|
| }
|
|
|
| @@ -48,7 +50,7 @@ TEST_F(TrayBrightnessTest, CreateDefaultView) {
|
| TEST_F(TrayBrightnessTest, CreateDefaultViewDuringMaximizeMode) {
|
| Shell::GetInstance()->maximize_mode_controller()->
|
| EnableMaximizeModeWindowManager(true);
|
| - scoped_ptr<views::View> tray(CreateDefaultView());
|
| + std::unique_ptr<views::View> tray(CreateDefaultView());
|
| EXPECT_TRUE(tray->visible());
|
| Shell::GetInstance()->maximize_mode_controller()->
|
| EnableMaximizeModeWindowManager(false);
|
| @@ -57,7 +59,7 @@ TEST_F(TrayBrightnessTest, CreateDefaultViewDuringMaximizeMode) {
|
| // Tests that the enabling of MaximizeMode affects a previously created
|
| // BrightnessView, changing the visibility.
|
| TEST_F(TrayBrightnessTest, DefaultViewVisibilityChangesDuringMaximizeMode) {
|
| - scoped_ptr<views::View> tray(CreateDefaultView());
|
| + std::unique_ptr<views::View> tray(CreateDefaultView());
|
| Shell::GetInstance()->maximize_mode_controller()->
|
| EnableMaximizeModeWindowManager(true);
|
| EXPECT_TRUE(tray->visible());
|
| @@ -69,7 +71,7 @@ TEST_F(TrayBrightnessTest, DefaultViewVisibilityChangesDuringMaximizeMode) {
|
| // Tests that when the detailed view is initially created that its
|
| // BrightnessView is created as visible.
|
| TEST_F(TrayBrightnessTest, CreateDetailedView) {
|
| - scoped_ptr<views::View> tray(CreateDetailedView());
|
| + std::unique_ptr<views::View> tray(CreateDetailedView());
|
| EXPECT_TRUE(tray->visible());
|
| }
|
|
|
| @@ -79,7 +81,7 @@ TEST_F(TrayBrightnessTest, CreateDetailedView) {
|
| TEST_F(TrayBrightnessTest, CreateDetailedViewDuringMaximizeMode) {
|
| Shell::GetInstance()->maximize_mode_controller()->
|
| EnableMaximizeModeWindowManager(true);
|
| - scoped_ptr<views::View> tray(CreateDetailedView());
|
| + std::unique_ptr<views::View> tray(CreateDetailedView());
|
| EXPECT_TRUE(tray->visible());
|
| Shell::GetInstance()->maximize_mode_controller()->
|
| EnableMaximizeModeWindowManager(false);
|
| @@ -88,7 +90,7 @@ TEST_F(TrayBrightnessTest, CreateDetailedViewDuringMaximizeMode) {
|
| // Tests that the enabling of MaximizeMode has no affect on the visibility of a
|
| // previously created BrightnessView that belongs to a detailed view.
|
| TEST_F(TrayBrightnessTest, DetailedViewVisibilityChangesDuringMaximizeMode) {
|
| - scoped_ptr<views::View> tray(CreateDetailedView());
|
| + std::unique_ptr<views::View> tray(CreateDetailedView());
|
| Shell::GetInstance()->maximize_mode_controller()->
|
| EnableMaximizeModeWindowManager(true);
|
| EXPECT_TRUE(tray->visible());
|
|
|