Revert 81277 - Profile shouldn't own DesktopNotificationService.DesktopNotificationService is now...

chrome/browser/sync/glue/theme_util_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 "chrome/browser/sync/glue/theme_util.h"
 
 #include "base/file_path.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/protocol/theme_specifics.pb.h"
@@ skipping 84 matching lines @@
  public:
   MOCK_METHOD0(SetNativeTheme, void());
   MOCK_METHOD0(UseDefaultTheme, void());
   MOCK_CONST_METHOD0(GetThemeID, std::string());
 };
 
 TEST_F(ThemeUtilTest, SetCurrentThemeDefaultTheme) {
   sync_pb::ThemeSpecifics theme_specifics;
   TestingProfile profile;
   MockThemeService* mock_theme_service = new MockThemeService;
-  ThemeServiceFactory::GetInstance()->ForceAssociationBetween(&profile,
-      mock_theme_service);
+  ThemeServiceFactory::ForceAssociationBetween(&profile, mock_theme_service);
 
   EXPECT_CALL(*mock_theme_service, UseDefaultTheme()).Times(1);
 
   SetCurrentThemeFromThemeSpecifics(theme_specifics, &profile);
 }
 
 TEST_F(ThemeUtilTest, SetCurrentThemeSystemTheme) {
   sync_pb::ThemeSpecifics theme_specifics;
   theme_specifics.set_use_system_theme_by_default(true);
 
   TestingProfile profile;
   MockThemeService* mock_theme_service = new MockThemeService;
-  ThemeServiceFactory::GetInstance()->ForceAssociationBetween(&profile,
-      mock_theme_service);
+  ThemeServiceFactory::ForceAssociationBetween(&profile, mock_theme_service);
 
   EXPECT_CALL(*mock_theme_service, SetNativeTheme()).Times(1);
 
   SetCurrentThemeFromThemeSpecifics(theme_specifics, &profile);
 }
 
 // TODO(akalin): Make ExtensionService/ExtensionUpdater testable
 // enough to be able to write a unittest for SetCurrentTheme for a
 // custom theme.
 
@@ skipping 79 matching lines @@
   EXPECT_TRUE(theme_specifics.has_use_system_theme_by_default());
   EXPECT_FALSE(theme_specifics.use_system_theme_by_default());
   EXPECT_EQ(kThemeName, theme_specifics.custom_theme_name());
   EXPECT_EQ(extension->id(), theme_specifics.custom_theme_id());
   EXPECT_EQ(kThemeUpdateUrl, theme_specifics.custom_theme_update_url());
 }
 
 TEST_F(ThemeUtilTest, SetCurrentThemeIfNecessaryDefaultThemeNotNecessary) {
   TestingProfile profile;
   MockThemeService* mock_theme_service = new MockThemeService;
-  ThemeServiceFactory::GetInstance()->ForceAssociationBetween(&profile,
-      mock_theme_service);
+  ThemeServiceFactory::ForceAssociationBetween(&profile, mock_theme_service);
 
   EXPECT_CALL(*mock_theme_service, GetThemeID()).WillRepeatedly(Return(
       ThemeService::kDefaultThemeID));
 
   // TODO(akalin): Mock out call to GetPrefs() under TOOLKIT_USES_GTK.
 
   sync_pb::ThemeSpecifics theme_specifics;
   SetCurrentThemeFromThemeSpecificsIfNecessary(theme_specifics,
                                                &profile);
 }
 
 }  // namespace
 
 }  // namespace browser_sync