Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2573)

Unified Diff: ash/system/chromeos/brightness/tray_brightness_unittest.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..be1d59c632803c4974e5a49f5e5bf78250ff35be 100644
--- a/ash/system/chromeos/brightness/tray_brightness_unittest.cc
+++ b/ash/system/chromeos/brightness/tray_brightness_unittest.cc
@@ -39,7 +39,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 +48,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 +57,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 +69,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 +79,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 +88,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());

Powered by Google App Engine
This is Rietveld 408576698