Replace Increment/DecrementKeepAliveCount by ScopedKeepAlives

chrome/browser/sessions/better_session_restore_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
 #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"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/session_restore_test_helper.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_service_test_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 277 matching lines @@
     EXPECT_EQ(password_present,
               post_interceptor_->DidLastUploadContain("posted-password"));
     EXPECT_EQ(password_present,
               post_interceptor_->DidLastUploadContain("password-entered"));
   }
 
   virtual Browser* QuitBrowserAndRestore(Browser* browser,
                                          bool close_all_windows) {
     Profile* profile = browser->profile();
 
+    ScopedKeepAlive test_keep_alive(KeepAliveOrigin::PANEL_VIEW,
+                                    KeepAliveRestartOption::DISABLED);
+
     // Close the browser.
-    chrome::IncrementKeepAliveCount();
     if (close_all_windows)
       CloseAllBrowsers();
     else
       CloseBrowserSynchronously(browser);
 
     SessionServiceTestHelper helper;
     helper.SetService(
         SessionServiceFactory::GetForProfileForSessionRestore(profile));
     helper.SetForceBrowserNotAliveWithNoWindows(true);
     helper.ReleaseService();
 
     // Create a new window, which should trigger session restore.
     ui_test_utils::BrowserAddedObserver window_observer;
     chrome::NewEmptyWindow(profile);
     Browser* new_browser = window_observer.WaitForSingleNewBrowser();
-    chrome::DecrementKeepAliveCount();
 
     return new_browser;
   }
 
   std::string fake_server_address() {
     return fake_server_address_;
   }
 
   std::string test_path() {
     return test_path_;
@@ skipping 490 matching lines @@
   CookieSettingsFactory::GetForProfile(new_browser->profile())
       ->SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY);
   // ... even if background mode is active.
   EnableBackgroundMode();
   new_browser = QuitBrowserAndRestore(new_browser, true);
   StoreDataWithPage(new_browser, "cookies.html");
   DisableBackgroundMode();
   new_browser = QuitBrowserAndRestore(new_browser, true);
   StoreDataWithPage(new_browser, "cookies.html");
 }