diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 18:48:17 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 18:48:17 +0000 |
| commit | 7211f74d2f66c46507e235b39245f736420e68d1 (patch) | |
| tree | ea8f2a932730dd902540f8e9ce2cb79db4b654c8 /chrome/browser/sync | |
| parent | 413a8e22c2ff986d335cdc9b86f78a6716a52975 (diff) | |
| download | chromium_src-7211f74d2f66c46507e235b39245f736420e68d1.zip chromium_src-7211f74d2f66c46507e235b39245f736420e68d1.tar.gz chromium_src-7211f74d2f66c46507e235b39245f736420e68d1.tar.bz2 | |
Profile shouldn't own DesktopNotificationService.
DesktopNotificationService is now owned by
DesktopNotificationServiceFactory, using Profile as a key. This uses the
ProfileKeyedService infrastructure originally created for
ThemeServiceFactory.
BUG=77155
TEST=existing tests
Review URL: http://codereview.chromium.org/6803012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81277 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/glue/theme_util_unittest.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/sync/glue/theme_util_unittest.cc b/chrome/browser/sync/glue/theme_util_unittest.cc index 5c83117..d72eb4a 100644 --- a/chrome/browser/sync/glue/theme_util_unittest.cc +++ b/chrome/browser/sync/glue/theme_util_unittest.cc @@ -102,7 +102,8 @@ TEST_F(ThemeUtilTest, SetCurrentThemeDefaultTheme) { sync_pb::ThemeSpecifics theme_specifics; TestingProfile profile; MockThemeService* mock_theme_service = new MockThemeService; - ThemeServiceFactory::ForceAssociationBetween(&profile, mock_theme_service); + ThemeServiceFactory::GetInstance()->ForceAssociationBetween(&profile, + mock_theme_service); EXPECT_CALL(*mock_theme_service, UseDefaultTheme()).Times(1); @@ -115,7 +116,8 @@ TEST_F(ThemeUtilTest, SetCurrentThemeSystemTheme) { TestingProfile profile; MockThemeService* mock_theme_service = new MockThemeService; - ThemeServiceFactory::ForceAssociationBetween(&profile, mock_theme_service); + ThemeServiceFactory::GetInstance()->ForceAssociationBetween(&profile, + mock_theme_service); EXPECT_CALL(*mock_theme_service, SetNativeTheme()).Times(1); @@ -215,7 +217,8 @@ TEST_F(ThemeUtilTest, GetThemeSpecificsHelperCustomThemeDistinct) { TEST_F(ThemeUtilTest, SetCurrentThemeIfNecessaryDefaultThemeNotNecessary) { TestingProfile profile; MockThemeService* mock_theme_service = new MockThemeService; - ThemeServiceFactory::ForceAssociationBetween(&profile, mock_theme_service); + ThemeServiceFactory::GetInstance()->ForceAssociationBetween(&profile, + mock_theme_service); EXPECT_CALL(*mock_theme_service, GetThemeID()).WillRepeatedly(Return( ThemeService::kDefaultThemeID)); |