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

Unified Diff: chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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: chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
index 7591e311b0487e84eae1de039e083ff8303734e4..8d1391fc99b0a29de905be6045eecdef4632f147 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
@@ -69,9 +69,9 @@ class LauncherContextMenuTest : public ash::test::AshTestBase {
Profile* profile() { return profile_.get(); }
private:
- scoped_ptr<TestingProfile> profile_;
+ std::unique_ptr<TestingProfile> profile_;
ash::ShelfModel shelf_model_;
- scoped_ptr<ChromeLauncherController> controller_;
+ std::unique_ptr<ChromeLauncherController> controller_;
DISALLOW_COPY_AND_ASSIGN(LauncherContextMenuTest);
};
@@ -81,7 +81,7 @@ class LauncherContextMenuTest : public ash::test::AshTestBase {
TEST_F(LauncherContextMenuTest,
NewIncognitoWindowMenuIsDisabledWhenIncognitoModeOff) {
// Initially, "New Incognito window" should be enabled.
- scoped_ptr<LauncherContextMenu> menu(
+ std::unique_ptr<LauncherContextMenu> menu(
CreateLauncherContextMenu(ash::TYPE_BROWSER_SHORTCUT));
ASSERT_TRUE(IsItemPresentInMenu(
menu.get(), LauncherContextMenu::MENU_NEW_INCOGNITO_WINDOW));
@@ -104,7 +104,7 @@ TEST_F(LauncherContextMenuTest,
TEST_F(LauncherContextMenuTest,
NewWindowMenuIsDisabledWhenIncognitoModeForced) {
// Initially, "New window" should be enabled.
- scoped_ptr<LauncherContextMenu> menu(
+ std::unique_ptr<LauncherContextMenu> menu(
CreateLauncherContextMenu(ash::TYPE_BROWSER_SHORTCUT));
ASSERT_TRUE(IsItemPresentInMenu(
menu.get(), LauncherContextMenu::MENU_NEW_WINDOW));
@@ -121,7 +121,7 @@ TEST_F(LauncherContextMenuTest,
// Verifies status of contextmenu items for desktop shell.
TEST_F(LauncherContextMenuTest, DesktopShellLauncherContextMenuItemCheck) {
- scoped_ptr<LauncherContextMenu> menu(
+ std::unique_ptr<LauncherContextMenu> menu(
CreateLauncherContextMenuForDesktopShell());
EXPECT_FALSE(
IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_OPEN_NEW));

Powered by Google App Engine
This is Rietveld 408576698