| Index: chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc
|
| diff --git a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc
|
| index df410a15910db45084cb69beb8bd439ffacb5490..fb5fc6246b6622136d6e57c1553b60102893d0ba 100644
|
| --- a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc
|
| +++ b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc
|
| @@ -75,11 +75,11 @@ IN_PROC_BROWSER_TEST_F(QuitWithAppsControllerInteractiveTest, QuitBehavior) {
|
|
|
| // One browser and one app window at this point.
|
| EXPECT_FALSE(chrome::BrowserIterator().done());
|
| - EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowRegisteredInAnyProfile(0));
|
| + EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowVisibleInAnyProfile(0));
|
|
|
| // On the first quit, show notification.
|
| EXPECT_FALSE(controller->ShouldQuit());
|
| - EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowRegisteredInAnyProfile(0));
|
| + EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowVisibleInAnyProfile(0));
|
| notification = g_browser_process->notification_ui_manager()->FindById(
|
| QuitWithAppsController::kQuitWithAppsNotificationID,
|
| NotificationUIManager::GetProfileID(profiles[0]));
|
| @@ -89,27 +89,27 @@ IN_PROC_BROWSER_TEST_F(QuitWithAppsControllerInteractiveTest, QuitBehavior) {
|
| notification->delegate()->Click();
|
| message_center->RemoveAllNotifications(false);
|
| EXPECT_FALSE(controller->ShouldQuit());
|
| - EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowRegisteredInAnyProfile(0));
|
| + EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowVisibleInAnyProfile(0));
|
| notification = g_browser_process->notification_ui_manager()->FindById(
|
| QuitWithAppsController::kQuitWithAppsNotificationID,
|
| NotificationUIManager::GetProfileID(profiles[0]));
|
| ASSERT_TRUE(notification);
|
|
|
| EXPECT_FALSE(chrome::BrowserIterator().done());
|
| - EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowRegisteredInAnyProfile(0));
|
| + EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowVisibleInAnyProfile(0));
|
|
|
| // If notification is closed by user, don't show it next time.
|
| notification->delegate()->Close(true);
|
| message_center->RemoveAllNotifications(false);
|
| EXPECT_FALSE(controller->ShouldQuit());
|
| - EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowRegisteredInAnyProfile(0));
|
| + EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowVisibleInAnyProfile(0));
|
| notification = g_browser_process->notification_ui_manager()->FindById(
|
| QuitWithAppsController::kQuitWithAppsNotificationID,
|
| NotificationUIManager::GetProfileID(profiles[0]));
|
| EXPECT_EQ(NULL, notification);
|
|
|
| EXPECT_FALSE(chrome::BrowserIterator().done());
|
| - EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowRegisteredInAnyProfile(0));
|
| + EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowVisibleInAnyProfile(0));
|
|
|
| // Quitting should not quit but close all browsers
|
| content::WindowedNotificationObserver observer(
|
| @@ -119,7 +119,7 @@ IN_PROC_BROWSER_TEST_F(QuitWithAppsControllerInteractiveTest, QuitBehavior) {
|
| observer.Wait();
|
|
|
| EXPECT_TRUE(chrome::BrowserIterator().done());
|
| - EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowRegisteredInAnyProfile(0));
|
| + EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowVisibleInAnyProfile(0));
|
|
|
| // Trying to quit while there are no browsers always shows notification.
|
| EXPECT_FALSE(controller->ShouldQuit());
|
| @@ -135,6 +135,6 @@ IN_PROC_BROWSER_TEST_F(QuitWithAppsControllerInteractiveTest, QuitBehavior) {
|
| content::NotificationService::AllSources());
|
| notification->delegate()->ButtonClick(0);
|
| message_center->RemoveAllNotifications(false);
|
| - EXPECT_FALSE(AppWindowRegistryUtil::IsAppWindowRegisteredInAnyProfile(0));
|
| + EXPECT_FALSE(AppWindowRegistryUtil::IsAppWindowVisibleInAnyProfile(0));
|
| quit_observer.Wait();
|
| }
|
|
|