Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1031)

Unified Diff: chrome/browser/ui/app_list/app_list_service_views_browsertest.cc

Issue 1778873002: Replace Increment/DecrementKeepAliveCount by ScopedKeepAlives (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@KAObserver
Patch Set: remove registry destructor dchecks Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/app_list/app_list_service_views_browsertest.cc
diff --git a/chrome/browser/ui/app_list/app_list_service_views_browsertest.cc b/chrome/browser/ui/app_list/app_list_service_views_browsertest.cc
index 298b624ff1638c01fc84829ed87b0774c746de4f..bd6fdec2b766a53fc0ed6d55a56eb992f41704e8 100644
--- a/chrome/browser/ui/app_list/app_list_service_views_browsertest.cc
+++ b/chrome/browser/ui/app_list/app_list_service_views_browsertest.cc
@@ -9,7 +9,7 @@
#include "base/run_loop.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/extension_browsertest.h"
-#include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/lifetime/keep_alive_registry.h"
#include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
#include "chrome/browser/ui/app_list/test/chrome_app_list_test_support.h"
#include "chrome/browser/ui/browser.h"
@@ -119,13 +119,13 @@ IN_PROC_BROWSER_TEST_F(AppListServiceViewsBrowserTest, MAYBE_AcceleratorClose) {
generator.PressKey(ui::VKEY_ESCAPE, 0);
#if !defined(OS_CHROMEOS)
- EXPECT_TRUE(chrome::WillKeepAlive());
+ EXPECT_TRUE(KeepAliveRegistry::GetInstance()->IsKeepingAlive());
#endif
base::RunLoop().RunUntilIdle();
#if !defined(OS_CHROMEOS)
- EXPECT_FALSE(chrome::WillKeepAlive());
+ EXPECT_FALSE(KeepAliveRegistry::GetInstance()->IsKeepingAlive());
#endif
EXPECT_FALSE(service->GetAppListWindow());
}

Powered by Google App Engine
This is Rietveld 408576698