| 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 f7e32b317e3d7a548b15662eb01310782314223f..743760a910023f78b9553afca21406021517cb22 100644
|
| --- a/chrome/browser/apps/app_window_interactive_uitest.cc
|
| +++ b/chrome/browser/apps/app_window_interactive_uitest.cc
|
| @@ -7,6 +7,7 @@
|
| #include "chrome/browser/apps/app_browsertest_util.h"
|
| #include "chrome/browser/lifetime/application_lifetime.h"
|
| #include "chrome/browser/lifetime/keep_alive_registry.h"
|
| +#include "chrome/browser/lifetime/keep_alive_types.h"
|
| #include "chrome/browser/ui/browser_list.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/test/base/interactive_test_utils.h"
|
| @@ -528,10 +529,11 @@ IN_PROC_BROWSER_TEST_F(AppWindowHiddenKeepAliveTest, ShownThenHidden) {
|
| LoadAndLaunchPlatformApp("minimal", "Launched");
|
| for (auto* browser : *BrowserList::GetInstance())
|
| browser->window()->Close();
|
| -
|
| - EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsKeepingAlive());
|
| + EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsOriginRegistered(
|
| + KeepAliveOrigin::CHROME_APP_DELEGATE));
|
| GetFirstAppWindow()->Hide();
|
| - EXPECT_FALSE(KeepAliveRegistry::GetInstance()->IsKeepingAlive());
|
| + EXPECT_FALSE(KeepAliveRegistry::GetInstance()->IsOriginRegistered(
|
| + KeepAliveOrigin::CHROME_APP_DELEGATE));
|
| }
|
|
|
| // A window that is hidden but re-shown should still keep Chrome alive.
|
| @@ -541,10 +543,12 @@ IN_PROC_BROWSER_TEST_F(AppWindowHiddenKeepAliveTest, ShownThenHiddenThenShown) {
|
| app_window->Hide();
|
| app_window->Show(AppWindow::SHOW_ACTIVE);
|
|
|
| - EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsKeepingAlive());
|
| + EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsOriginRegistered(
|
| + KeepAliveOrigin::CHROME_APP_DELEGATE));
|
| for (auto* browser : *BrowserList::GetInstance())
|
| browser->window()->Close();
|
| - EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsKeepingAlive());
|
| + EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsOriginRegistered(
|
| + KeepAliveOrigin::CHROME_APP_DELEGATE));
|
| app_window->GetBaseWindow()->Close();
|
| }
|
|
|
| @@ -578,7 +582,8 @@ IN_PROC_BROWSER_TEST_F(AppWindowHiddenKeepAliveTest, HiddenThenShown) {
|
| launched_listener.Reply("");
|
| EXPECT_TRUE(shown_listener.WaitUntilSatisfied());
|
| EXPECT_FALSE(app_window->is_hidden());
|
| - EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsKeepingAlive());
|
| + EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsOriginRegistered(
|
| + KeepAliveOrigin::CHROME_APP_DELEGATE));
|
| app_window->GetBaseWindow()->Close();
|
| }
|
|
|
|
|