Cleanup: Pull some browser keep alive functions into its own file.

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 <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/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.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/browser_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_iterator.h"
@@ skipping 110 matching lines @@
         background_mode_active_(false) {}
 
   void SetBackgroundModeActive(bool active) {
     background_mode_active_ = active;
   }
 
   bool IsBackgroundModeActive() override { return background_mode_active_; }
 
  private:
   bool background_mode_active_;
-
 };
 
 }  // namespace
 
 class BetterSessionRestoreTest : public InProcessBrowserTest {
  public:
   BetterSessionRestoreTest()
       : fake_server_address_("http://www.test.com/"),
         test_path_("session_restore/"),
         title_pass_(base::ASCIIToUTF16("PASS")),
@@ skipping 146 matching lines @@
               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();
 
     // Close the browser.
-    chrome::IncrementKeepAliveCount();
+    browser_lifetime::ScopedKeepAlive keep_alive;
     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, chrome::HOST_DESKTOP_TYPE_NATIVE);
-    Browser* new_browser = window_observer.WaitForSingleNewBrowser();
-    chrome::DecrementKeepAliveCount();
-
-    return new_browser;
+    return window_observer.WaitForSingleNewBrowser();
   }
 
   std::string fake_server_address() {
     return fake_server_address_;
   }
 
   std::string test_path() {
     return test_path_;
   }
 
@@ skipping 37 matching lines @@
  protected:
   Browser* QuitBrowserAndRestore(Browser* browser,
                                  bool close_all_windows) override {
     SessionRestoreTestHelper session_restore_observer;
     Browser* new_browser = BetterSessionRestoreTest::QuitBrowserAndRestore(
         browser, close_all_windows);
     session_restore_observer.Wait();
     return new_browser;
   }
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(ContinueWhereILeftOffTest);
 };
 
 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, PRE_SessionCookies) {
   // Set the startup preference to "continue where I left off" and visit a page
   // which stores a session cookie.
   StoreDataWithPage("session_cookies.html");
 }
 
 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, SessionCookies) {
@@ skipping 437 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");
 }