| Index: chrome/browser/apps/app_window_interactive_uitest.cc
|
| diff --git a/chrome/browser/apps/app_window_interactive_uitest.cc b/chrome/browser/apps/app_window_interactive_uitest.cc
|
| index fa7d6d76486485c9879bea6d99269e96938e312e..2cc7598166126b9ae004598ebc850c32cd7d7d78 100644
|
| --- a/chrome/browser/apps/app_window_interactive_uitest.cc
|
| +++ b/chrome/browser/apps/app_window_interactive_uitest.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "chrome/browser/apps/app_browsertest_util.h"
|
| #include "chrome/browser/lifetime/application_lifetime.h"
|
| +#include "chrome/browser/lifetime/browser_keep_alive.h"
|
| #include "chrome/browser/ui/browser_iterator.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/test/base/interactive_test_utils.h"
|
| @@ -526,9 +527,9 @@ IN_PROC_BROWSER_TEST_F(AppWindowHiddenKeepAliveTest, ShownThenHidden) {
|
| for (chrome::BrowserIterator it; !it.done(); it.Next())
|
| it->window()->Close();
|
|
|
| - EXPECT_TRUE(chrome::WillKeepAlive());
|
| + EXPECT_TRUE(browser_lifetime::WillKeepAlive());
|
| GetFirstAppWindow()->Hide();
|
| - EXPECT_FALSE(chrome::WillKeepAlive());
|
| + EXPECT_FALSE(browser_lifetime::WillKeepAlive());
|
| }
|
|
|
| // A window that is hidden but re-shown should still keep Chrome alive.
|
| @@ -538,10 +539,10 @@ IN_PROC_BROWSER_TEST_F(AppWindowHiddenKeepAliveTest, ShownThenHiddenThenShown) {
|
| app_window->Hide();
|
| app_window->Show(AppWindow::SHOW_ACTIVE);
|
|
|
| - EXPECT_TRUE(chrome::WillKeepAlive());
|
| + EXPECT_TRUE(browser_lifetime::WillKeepAlive());
|
| for (chrome::BrowserIterator it; !it.done(); it.Next())
|
| it->window()->Close();
|
| - EXPECT_TRUE(chrome::WillKeepAlive());
|
| + EXPECT_TRUE(browser_lifetime::WillKeepAlive());
|
| app_window->GetBaseWindow()->Close();
|
| }
|
|
|
| @@ -575,7 +576,7 @@ IN_PROC_BROWSER_TEST_F(AppWindowHiddenKeepAliveTest, HiddenThenShown) {
|
| launched_listener.Reply("");
|
| EXPECT_TRUE(shown_listener.WaitUntilSatisfied());
|
| EXPECT_FALSE(app_window->is_hidden());
|
| - EXPECT_TRUE(chrome::WillKeepAlive());
|
| + EXPECT_TRUE(browser_lifetime::WillKeepAlive());
|
| app_window->GetBaseWindow()->Close();
|
| }
|
|
|
|
|