Rename Start/EndKeepAlive to Increment/DecrementKeepAliveCount

chrome/browser/background/background_mode_manager_unittest.cc

 // Copyright (c) 2011 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 "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_shutdown.h"
@@ skipping 402 matching lines @@
   // Required for extension service.
   content::TestBrowserThreadBundle thread_bundle;
 
   scoped_ptr<TestingProfileManager> profile_manager =
       CreateTestingProfileManager();
 
   // BackgroundModeManager actually affects Chrome start/stop state,
   // tearing down our thread bundle before we've had chance to clean
   // everything up. Keeping Chrome alive prevents this.
   // We aren't interested in if the keep alive works correctly in this test.
-  chrome::StartKeepAlive();
+  chrome::IncrementKeepAliveCount();
   TestingProfile* profile = profile_manager->CreateTestingProfile("p");
 
 #if defined(OS_CHROMEOS)
   // ChromeOS needs extra services to run in the following order.
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service;
   chromeos::ScopedTestCrosSettings test_cros_settings;
   chromeos::ScopedTestUserManager test_user_manager;
 
   // On ChromeOS shutdown, HandleAppExitingForPlatform will call
-  // chrome::EndKeepAlive because it assumes the aura shell
-  // called chrome::StartKeepAlive. Simulate the call here.
-  chrome::StartKeepAlive();
+  // chrome::DecrementKeepAliveCount because it assumes the aura shell
+  // called chrome::IncrementKeepAliveCount. Simulate the call here.
+  chrome::IncrementKeepAliveCount();
 #endif
 
   scoped_refptr<extensions::Extension> component_extension(
     CreateExtension(
         extensions::Manifest::COMPONENT,
         "{\"name\": \"Component Extension\","
         "\"version\": \"1.0\","
         "\"manifest_version\": 2,"
         "\"permissions\": [\"background\"]}",
         "ID-1"));
@@ skipping 66 matching lines @@
           base::UTF8ToUTF16("Regular Extension with Options"));
   EXPECT_TRUE(submenu->IsCommandIdEnabled(submenu->GetCommandIdAt(3)));
 
   // We have to destroy the profile now because we created it with real thread
   // state. This causes a lot of machinery to spin up that stops working
   // when we tear down our thread state at the end of the test.
   profile_manager->DeleteTestingProfile("p");
 
   // We're getting ready to shutdown the message loop. Clear everything out!
   base::MessageLoop::current()->RunUntilIdle();
-  chrome::EndKeepAlive(); // Matching the above chrome::StartKeepAlive().
+  chrome::DecrementKeepAliveCount();  // Matching the above
+                                      // chrome::IncrementKeepAliveCount().
 
   // TestBackgroundModeManager has dependencies on the infrastructure.
   // It should get cleared first.
   manager.reset();
 
   // The Profile Manager references the Browser Process.
   // The Browser Process references the Notification UI Manager.
   // The Notification UI Manager references the Message Center.
   // As a result, we have to clear the browser process state here
   // before tearing down the Message Center.
   profile_manager.reset();
 
-  // Message Center shutdown must occur after the EndKeepAlive because
-  // EndKeepAlive will end up referencing the message center during cleanup.
+  // Message Center shutdown must occur after the DecrementKeepAliveCount
+  // because DecrementKeepAliveCount will end up referencing the message
+  // center during cleanup.
   message_center::MessageCenter::Shutdown();
 
   // Clear the shutdown flag to isolate the remaining effect of this test.
   browser_shutdown::SetTryingToQuit(false);
 }
 
 TEST_F(BackgroundModeManagerTest, BackgroundMenuGenerationMultipleProfile) {
   // Aura clears notifications from the message center at shutdown.
   message_center::MessageCenter::Initialize();
 
   // Required for extension service.
   content::TestBrowserThreadBundle thread_bundle;
 
   scoped_ptr<TestingProfileManager> profile_manager =
       CreateTestingProfileManager();
 
   // BackgroundModeManager actually affects Chrome start/stop state,
   // tearing down our thread bundle before we've had chance to clean
   // everything up. Keeping Chrome alive prevents this.
   // We aren't interested in if the keep alive works correctly in this test.
-  chrome::StartKeepAlive();
+  chrome::IncrementKeepAliveCount();
   TestingProfile* profile1 = profile_manager->CreateTestingProfile("p1");
   TestingProfile* profile2 = profile_manager->CreateTestingProfile("p2");
 
 #if defined(OS_CHROMEOS)
   // ChromeOS needs extensionsra services to run in the following order.
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service;
   chromeos::ScopedTestCrosSettings test_cros_settings;
   chromeos::ScopedTestUserManager test_user_manager;
 
   // On ChromeOS shutdown, HandleAppExitingForPlatform will call
-  // chrome::EndKeepAlive because it assumes the aura shell
-  // called chrome::StartKeepAlive. Simulate the call here.
-  chrome::StartKeepAlive();
+  // chrome::DecrementKeepAliveCount because it assumes the aura shell
+  // called chrome::IncrementKeepAliveCount. Simulate the call here.
+  chrome::IncrementKeepAliveCount();
 #endif
 
   scoped_refptr<extensions::Extension> component_extension(
     CreateExtension(
         extensions::Manifest::COMPONENT,
         "{\"name\": \"Component Extension\","
         "\"version\": \"1.0\","
         "\"manifest_version\": 2,"
         "\"permissions\": [\"background\"]}",
         "ID-1"));
@@ skipping 154 matching lines @@
   delete status_icon;
 
   // We have to destroy the profiles now because we created them with real
   // thread state. This causes a lot of machinery to spin up that stops working
   // when we tear down our thread state at the end of the test.
   profile_manager->DeleteTestingProfile("p2");
   profile_manager->DeleteTestingProfile("p1");
 
   // We're getting ready to shutdown the message loop. Clear everything out!
   base::MessageLoop::current()->RunUntilIdle();
-  chrome::EndKeepAlive(); // Matching the above chrome::StartKeepAlive().
+  chrome::DecrementKeepAliveCount();  // Matching the above
+                                      // chrome::IncrementKeepAliveCount().
 
   // TestBackgroundModeManager has dependencies on the infrastructure.
   // It should get cleared first.
   manager.reset();
 
   // The Profile Manager references the Browser Process.
   // The Browser Process references the Notification UI Manager.
   // The Notification UI Manager references the Message Center.
   // As a result, we have to clear the browser process state here
   // before tearing down the Message Center.
   profile_manager.reset();
 
-  // Message Center shutdown must occur after the EndKeepAlive because
-  // EndKeepAlive will end up referencing the message center during cleanup.
+  // Message Center shutdown must occur after the DecrementKeepAliveCount
+  // because DecrementKeepAliveCount will end up referencing the message
+  // center during cleanup.
   message_center::MessageCenter::Shutdown();
 
   // Clear the shutdown flag to isolate the remaining effect of this test.
   browser_shutdown::SetTryingToQuit(false);
 }