Replace Increment/DecrementKeepAliveCount by ScopedKeepAlives

chrome/browser/sessions/better_session_restore_browsertest.cc

Index: chrome/browser/sessions/better_session_restore_browsertest.cc
diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc
index 39ccea2d014ad3e89694bc55a9de5339764168ec..194594c93a84b8ca7fa7f7777955bb2daadbd22b 100644
--- a/chrome/browser/sessions/better_session_restore_browsertest.cc
+++ b/chrome/browser/sessions/better_session_restore_browsertest.cc
@@ -19,7 +19,8 @@
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/lifetime/keep_alive_types.h"
+#include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_impl.h"
@@ -317,8 +318,9 @@ class BetterSessionRestoreTest : public InProcessBrowserTest {
                                          bool close_all_windows) {
     Profile* profile = browser->profile();
 
+    ScopedKeepAlive test_keep_alive(KeepAliveOrigin::PANEL_VIEW);
+
     // Close the browser.
-    chrome::IncrementKeepAliveCount();
     if (close_all_windows)
       CloseAllBrowsers();
     else
@@ -334,7 +336,6 @@ class BetterSessionRestoreTest : public InProcessBrowserTest {
     ui_test_utils::BrowserAddedObserver window_observer;
     chrome::NewEmptyWindow(profile);
     Browser* new_browser = window_observer.WaitForSingleNewBrowser();
-    chrome::DecrementKeepAliveCount();
 
     return new_browser;
   }