| Index: chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm
|
| diff --git a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm
|
| index d7aa40419d2be4c8511097e9730d1e2a12bfc621..8ea62f2766cb2db2342c514f0d7cd247fe20b557 100644
|
| --- a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm
|
| +++ b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm
|
| @@ -20,7 +20,7 @@
|
| #include "chrome/browser/notifications/notification_ui_manager.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| -#include "chrome/browser/ui/browser_iterator.h"
|
| +#include "chrome/browser/ui/browser_list.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "content/public/browser/notification_service.h"
|
| @@ -82,7 +82,7 @@ IN_PROC_BROWSER_TEST_P(QuitWithAppsControllerInteractiveTest, QuitBehavior) {
|
| ASSERT_TRUE(listener.WaitUntilSatisfied());
|
|
|
| // One browser and one app window at this point.
|
| - EXPECT_FALSE(chrome::BrowserIterator().done());
|
| + EXPECT_FALSE(BrowserList::GetInstance()->empty());
|
| EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowVisibleInAnyProfile(0));
|
|
|
| // On the first quit, show notification.
|
| @@ -103,7 +103,7 @@ IN_PROC_BROWSER_TEST_P(QuitWithAppsControllerInteractiveTest, QuitBehavior) {
|
| NotificationUIManager::GetProfileID(profiles[0]));
|
| ASSERT_TRUE(notification);
|
|
|
| - EXPECT_FALSE(chrome::BrowserIterator().done());
|
| + EXPECT_FALSE(BrowserList::GetInstance()->empty());
|
| EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowVisibleInAnyProfile(0));
|
|
|
| // If notification is closed by user, don't show it next time.
|
| @@ -116,7 +116,7 @@ IN_PROC_BROWSER_TEST_P(QuitWithAppsControllerInteractiveTest, QuitBehavior) {
|
| NotificationUIManager::GetProfileID(profiles[0]));
|
| EXPECT_EQ(NULL, notification);
|
|
|
| - EXPECT_FALSE(chrome::BrowserIterator().done());
|
| + EXPECT_FALSE(BrowserList::GetInstance()->empty());
|
| EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowVisibleInAnyProfile(0));
|
|
|
| // Get a reference to the open app window before the browser closes.
|
| @@ -129,7 +129,7 @@ IN_PROC_BROWSER_TEST_P(QuitWithAppsControllerInteractiveTest, QuitBehavior) {
|
| chrome_browser_application_mac::Terminate();
|
| observer.Wait();
|
|
|
| - EXPECT_TRUE(chrome::BrowserIterator().done());
|
| + EXPECT_TRUE(BrowserList::GetInstance()->empty());
|
| EXPECT_TRUE(AppWindowRegistryUtil::IsAppWindowVisibleInAnyProfile(0));
|
|
|
| // Trying to quit while there are no browsers always shows notification.
|
|
|