Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5719)

Unified Diff: chrome/browser/sync/glue/theme_util_unittest.cc

Issue 6803012: Profile shouldn't own DesktopNotificationService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/glue/theme_util_unittest.cc
diff --git a/chrome/browser/sync/glue/theme_util_unittest.cc b/chrome/browser/sync/glue/theme_util_unittest.cc
index 5c831174a4648a75621cbf0a1a940c80e848f70c..d72eb4aa03d385158bc824987eda55720ed2b7bf 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));
« no previous file with comments | « chrome/browser/profiles/profile_keyed_service_factory.cc ('k') | chrome/browser/themes/theme_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698