| Index: chrome/browser/ui/browser_command_controller_unittest.cc
|
| diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc
|
| index 22a62f7fa9311ca61ae57882003d026b6d767e54..67b35cf6bce303061fa237ad80445ed3212ba20f 100644
|
| --- a/chrome/browser/ui/browser_command_controller_unittest.cc
|
| +++ b/chrome/browser/ui/browser_command_controller_unittest.cc
|
| @@ -159,22 +159,26 @@ TEST_F(BrowserCommandControllerTest, IncognitoCommands) {
|
| TestingProfile* testprofile = browser()->profile()->AsTestingProfile();
|
| EXPECT_TRUE(testprofile);
|
| testprofile->SetGuestSession(true);
|
| - chrome::BrowserCommandController
|
| - ::UpdateSharedCommandsForIncognitoAvailability(
|
| - browser()->command_controller()->command_updater(), testprofile);
|
| + chrome::BrowserCommandController::
|
| + UpdateSharedCommandsForIncognitoAvailability(
|
| + browser()->command_controller()->command_updater(), testprofile);
|
| EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPTIONS));
|
| EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_IMPORT_SETTINGS));
|
| EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_SHOW_SIGNIN));
|
| + EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_NEW_INCOGNITO_WINDOW));
|
| + EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_NEW_WINDOW));
|
|
|
| testprofile->SetGuestSession(false);
|
| IncognitoModePrefs::SetAvailability(browser()->profile()->GetPrefs(),
|
| IncognitoModePrefs::FORCED);
|
| - chrome::BrowserCommandController
|
| - ::UpdateSharedCommandsForIncognitoAvailability(
|
| - browser()->command_controller()->command_updater(), testprofile);
|
| + chrome::BrowserCommandController::
|
| + UpdateSharedCommandsForIncognitoAvailability(
|
| + browser()->command_controller()->command_updater(), testprofile);
|
| EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_OPTIONS));
|
| EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_IMPORT_SETTINGS));
|
| EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_SHOW_SIGNIN));
|
| + EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_NEW_INCOGNITO_WINDOW));
|
| + EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_NEW_WINDOW));
|
| }
|
|
|
| TEST_F(BrowserCommandControllerTest, AppFullScreen) {
|
|
|