Rename Start/EndKeepAlive to Increment/DecrementKeepAliveCount

chrome/browser/chromeos/policy/device_local_account_browsertest.cc

 // Copyright (c) 2013 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 <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 589 matching lines @@
   ASSERT_TRUE(host);
   chromeos::OobeUI* oobe_ui = host->GetOobeUI();
   ASSERT_TRUE(oobe_ui);
   base::RunLoop run_loop;
   const bool oobe_ui_ready = oobe_ui->IsJSReady(run_loop.QuitClosure());
   if (!oobe_ui_ready)
     run_loop.Run();
 
   // Ensure that the browser stays alive, even though no windows are opened
   // during session start.
-  chrome::StartKeepAlive();
+  chrome::IncrementKeepAliveCount();
 
   // Start login into the device-local account.
   host->StartSignInScreen(LoginScreenContext());
   chromeos::ExistingUserController* controller =
       chromeos::ExistingUserController::current_controller();
   ASSERT_TRUE(controller);
   controller->LoginAsPublicAccount(user_id_1_);
 
   // Wait for the session to start.
   content::WindowedNotificationObserver(chrome::NOTIFICATION_SESSION_STARTED,
                                         base::Bind(IsSessionStarted)).Wait();
 
   // Open a browser window.
   chrome::NewEmptyWindow(GetProfileForTest(), chrome::HOST_DESKTOP_TYPE_ASH);
   BrowserList* browser_list =
     BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
   EXPECT_EQ(1U, browser_list->size());
   Browser* browser = browser_list->get(0);
   ASSERT_TRUE(browser);
   BrowserWindow* browser_window = browser->window();
   ASSERT_TRUE(browser_window);
-  chrome::EndKeepAlive();
+  chrome::DecrementKeepAliveCount();
 
   // Verify that an attempt to enter fullscreen mode is denied.
   EXPECT_FALSE(browser_window->IsFullscreen());
   chrome::ToggleFullscreenMode(browser);
   EXPECT_FALSE(browser_window->IsFullscreen());
 }
 
 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExtensionsUncached) {
   // Make it possible to force-install a hosted app and an extension.
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
@@ skipping 40 matching lines @@
   ASSERT_TRUE(host);
   chromeos::OobeUI* oobe_ui = host->GetOobeUI();
   ASSERT_TRUE(oobe_ui);
   base::RunLoop run_loop;
   const bool oobe_ui_ready = oobe_ui->IsJSReady(run_loop.QuitClosure());
   if (!oobe_ui_ready)
     run_loop.Run();
 
   // Ensure that the browser stays alive, even though no windows are opened
   // during session start.
-  chrome::StartKeepAlive();
+  chrome::IncrementKeepAliveCount();
 
   // Start listening for app/extension installation results.
   content::WindowedNotificationObserver hosted_app_observer(
       chrome::NOTIFICATION_EXTENSION_INSTALLED,
       base::Bind(DoesInstallSuccessReferToId, kHostedAppID));
   content::WindowedNotificationObserver extension_observer(
       chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
       base::Bind(DoesInstallFailureReferToId, kGoodExtensionID));
 
   // Start login into the device-local account.
@@ skipping 78 matching lines @@
   ASSERT_TRUE(host);
   chromeos::OobeUI* oobe_ui = host->GetOobeUI();
   ASSERT_TRUE(oobe_ui);
   base::RunLoop run_loop;
   const bool oobe_ui_ready = oobe_ui->IsJSReady(run_loop.QuitClosure());
   if (!oobe_ui_ready)
     run_loop.Run();
 
   // Ensure that the browser stays alive, even though no windows are opened
   // during session start.
-  chrome::StartKeepAlive();
+  chrome::IncrementKeepAliveCount();
 
   // Start listening for app/extension installation results.
   content::WindowedNotificationObserver hosted_app_observer(
       chrome::NOTIFICATION_EXTENSION_INSTALLED,
       base::Bind(DoesInstallSuccessReferToId, kHostedAppID));
   content::WindowedNotificationObserver extension_observer(
       chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
       base::Bind(DoesInstallFailureReferToId, kGoodExtensionID));
 
   // Start login into the device-local account.
@@ skipping 105 matching lines @@
   ASSERT_TRUE(host);
   chromeos::OobeUI* oobe_ui = host->GetOobeUI();
   ASSERT_TRUE(oobe_ui);
   run_loop.reset(new base::RunLoop);
   const bool oobe_ui_ready = oobe_ui->IsJSReady(run_loop->QuitClosure());
   if (!oobe_ui_ready)
     run_loop->Run();
 
   // Ensure that the browser stays alive, even though no windows are opened
   // during session start.
-  chrome::StartKeepAlive();
+  chrome::IncrementKeepAliveCount();
 
   // Start login into the device-local account.
   host->StartSignInScreen(LoginScreenContext());
   chromeos::ExistingUserController* controller =
       chromeos::ExistingUserController::current_controller();
   ASSERT_TRUE(controller);
   controller->LoginAsPublicAccount(user_id_1_);
 
   // Wait for the session to start.
   content::WindowedNotificationObserver(chrome::NOTIFICATION_SESSION_STARTED,
@@ skipping 259 matching lines @@
   if (!IsSessionStarted()) {
     content::WindowedNotificationObserver(chrome::NOTIFICATION_SESSION_STARTED,
                                           base::Bind(IsSessionStarted)).Wait();
   }
 }
 
 INSTANTIATE_TEST_CASE_P(TermsOfServiceTestInstance,
                         TermsOfServiceTest, testing::Bool());
 
 }  // namespace policy