| Index: chrome/browser/background/background_mode_manager_unittest.cc
|
| diff --git a/chrome/browser/background/background_mode_manager_unittest.cc b/chrome/browser/background/background_mode_manager_unittest.cc
|
| index b03339abaaa7f388bda699a508346e609736fe77..f160a30bff00622bce9ee37be4598d0137c33165 100644
|
| --- a/chrome/browser/background/background_mode_manager_unittest.cc
|
| +++ b/chrome/browser/background/background_mode_manager_unittest.cc
|
| @@ -72,14 +72,14 @@ class TestBackgroundModeManager : public BackgroundModeManager {
|
|
|
| static void AssertBackgroundModeActive(
|
| const TestBackgroundModeManager& manager) {
|
| - EXPECT_TRUE(browser::WillKeepAlive());
|
| + EXPECT_TRUE(chrome::WillKeepAlive());
|
| EXPECT_TRUE(manager.HaveStatusTray());
|
| EXPECT_TRUE(manager.IsLaunchOnStartup());
|
| }
|
|
|
| static void AssertBackgroundModeInactive(
|
| const TestBackgroundModeManager& manager) {
|
| - EXPECT_FALSE(browser::WillKeepAlive());
|
| + EXPECT_FALSE(chrome::WillKeepAlive());
|
| EXPECT_FALSE(manager.HaveStatusTray());
|
| EXPECT_FALSE(manager.IsLaunchOnStartup());
|
| }
|
| @@ -89,7 +89,7 @@ TEST_F(BackgroundModeManagerTest, BackgroundAppLoadUnload) {
|
| TestBackgroundModeManager manager(
|
| command_line_.get(), profile_manager_.profile_info_cache(), true);
|
| manager.RegisterProfile(profile);
|
| - EXPECT_FALSE(browser::WillKeepAlive());
|
| + EXPECT_FALSE(chrome::WillKeepAlive());
|
|
|
| // Mimic app load.
|
| manager.OnBackgroundAppInstalled(NULL);
|
| @@ -173,7 +173,7 @@ TEST_F(BackgroundModeManagerTest, MultiProfile) {
|
| command_line_.get(), profile_manager_.profile_info_cache(), true);
|
| manager.RegisterProfile(profile1);
|
| manager.RegisterProfile(profile2);
|
| - EXPECT_FALSE(browser::WillKeepAlive());
|
| + EXPECT_FALSE(chrome::WillKeepAlive());
|
|
|
| // Install app, should show status tray icon.
|
| manager.OnBackgroundAppInstalled(NULL);
|
| @@ -214,7 +214,7 @@ TEST_F(BackgroundModeManagerTest, ProfileInfoCacheStorage) {
|
| command_line_.get(), profile_manager_.profile_info_cache(), true);
|
| manager.RegisterProfile(profile1);
|
| manager.RegisterProfile(profile2);
|
| - EXPECT_FALSE(browser::WillKeepAlive());
|
| + EXPECT_FALSE(chrome::WillKeepAlive());
|
|
|
| ProfileInfoCache* cache = profile_manager_.profile_info_cache();
|
| EXPECT_EQ(2u, cache->GetNumberOfProfiles());
|
| @@ -259,7 +259,7 @@ TEST_F(BackgroundModeManagerTest, ProfileInfoCacheObserver) {
|
| TestBackgroundModeManager manager(
|
| command_line_.get(), profile_manager_.profile_info_cache(), true);
|
| manager.RegisterProfile(profile1);
|
| - EXPECT_FALSE(browser::WillKeepAlive());
|
| + EXPECT_FALSE(chrome::WillKeepAlive());
|
|
|
| // Install app, should show status tray icon.
|
| manager.OnBackgroundAppInstalled(NULL);
|
|
|