diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 18:41:06 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 18:41:06 +0000 |
| commit | 21103034ad3f39ca1b24a254e97ff91776ea9a9e (patch) | |
| tree | 8bf3b7e1d12fdf3aac534339b0ba27342fb4610d /chrome/browser/background_mode_manager_unittest.cc | |
| parent | 5e94010a11a6c2f0f3c93063c9a078bfbdbc5468 (diff) | |
| download | chromium_src-21103034ad3f39ca1b24a254e97ff91776ea9a9e.zip chromium_src-21103034ad3f39ca1b24a254e97ff91776ea9a9e.tar.gz chromium_src-21103034ad3f39ca1b24a254e97ff91776ea9a9e.tar.bz2 | |
Changed EXTENSION_UNINSTALLED notification to happen after uninstallation.
The important part is that it comes after the EXTENSION_UNLOADED
notification is sent. This makes it easier on the listeners, as they
can assume that extension notifications other than EXTENSION_UNINSTALLED
are sent for currently-installed extensions.
BUG=54415
TEST=BackgroundModeManagerTest
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=60834
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=60848
Review URL: http://codereview.chromium.org/3461025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61089 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/background_mode_manager_unittest.cc')
| -rw-r--r-- | chrome/browser/background_mode_manager_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/background_mode_manager_unittest.cc b/chrome/browser/background_mode_manager_unittest.cc index 075db814..4c43610 100644 --- a/chrome/browser/background_mode_manager_unittest.cc +++ b/chrome/browser/background_mode_manager_unittest.cc @@ -56,15 +56,15 @@ TEST_F(BackgroundModeManagerTest, BackgroundAppInstallUninstall) { TestingProfile profile; TestBackgroundModeManager manager(&profile, command_line_.get()); // Call to AppInstalled() will cause chrome to be set to launch on startup, - // and call to AppUninstalling() set chrome to not launch on startup. + // and call to AppUninstalled() set chrome to not launch on startup. EXPECT_CALL(manager, EnableLaunchOnStartup(true)); EXPECT_CALL(manager, CreateStatusTrayIcon()); - EXPECT_CALL(manager, EnableLaunchOnStartup(false)); EXPECT_CALL(manager, RemoveStatusTrayIcon()); + EXPECT_CALL(manager, EnableLaunchOnStartup(false)); manager.OnBackgroundAppInstalled(); manager.OnBackgroundAppLoaded(); - manager.OnBackgroundAppUninstalled(); manager.OnBackgroundAppUnloaded(); + manager.OnBackgroundAppUninstalled(); } TEST_F(BackgroundModeManagerTest, BackgroundPrefDisabled) { @@ -72,15 +72,15 @@ TEST_F(BackgroundModeManagerTest, BackgroundPrefDisabled) { TestingProfile profile; profile.GetPrefs()->SetBoolean(prefs::kBackgroundModeEnabled, false); TestBackgroundModeManager manager(&profile, command_line_.get()); + EXPECT_CALL(manager, CreateStatusTrayIcon()).Times(0); // Should not change launch on startup status when installing/uninstalling // if background mode is disabled. EXPECT_CALL(manager, EnableLaunchOnStartup(true)).Times(0); - EXPECT_CALL(manager, CreateStatusTrayIcon()).Times(0); manager.OnBackgroundAppInstalled(); manager.OnBackgroundAppLoaded(); EXPECT_FALSE(BrowserList::WillKeepAlive()); - manager.OnBackgroundAppUninstalled(); manager.OnBackgroundAppUnloaded(); + manager.OnBackgroundAppUninstalled(); } TEST_F(BackgroundModeManagerTest, BackgroundPrefDynamicDisable) { |