Revert changes to have ExtensionService notify ThemeService directly

chrome/browser/themes/theme_service_factory.cc

 // Copyright (c) 2012 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/themes/theme_service_factory.h"
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/common/pref_names.h"
 
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #endif
 
 // static
 ThemeService* ThemeServiceFactory::GetForProfile(Profile* profile) {
   return static_cast<ThemeService*>(
-      GetInstance()->GetServiceForProfile(profile, true /* create */));
+      GetInstance()->GetServiceForProfile(profile, true));
+}
+
+// static
+const extensions::Extension* ThemeServiceFactory::GetThemeForProfile(
+    Profile* profile) {
+  std::string id = GetForProfile(profile)->GetThemeID();
+  if (id == ThemeService::kDefaultThemeID)
+    return NULL;
+
+  return profile->GetExtensionService()->GetExtensionById(id, false);
 }
 
 // static
 ThemeServiceFactory* ThemeServiceFactory::GetInstance() {
   return Singleton<ThemeServiceFactory>::get();
 }
 
-// static
-void ThemeServiceFactory::SetThemeForProfile(
-    Profile* profile,
-    const extensions::Extension* theme) {
-  ThemeService* theme_service =
-      static_cast<ThemeService*>(
-          GetInstance()->GetServiceForProfile(profile, false /* create */));
-  if (theme_service) {
-    theme_service->SetTheme(theme);
-  } else {
-    // The theme service will pick up the new theme when it's created.
-    ThemeService::SaveThemeIDForProfile(profile, theme->id());
-  }
-}
-
 ThemeServiceFactory::ThemeServiceFactory()
     : ProfileKeyedServiceFactory("ThemeService",
                                  ProfileDependencyManager::GetInstance()) {}
 
 ThemeServiceFactory::~ThemeServiceFactory() {}
 
 ProfileKeyedService* ThemeServiceFactory::BuildServiceInstanceFor(
     Profile* profile) const {
   ThemeService* provider = NULL;
 #if defined(TOOLKIT_GTK)
@@ skipping 24 matching lines @@
                                 PrefService::UNSYNCABLE_PREF);
   prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints,
                                 PrefService::UNSYNCABLE_PREF);
   prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties,
                                 PrefService::UNSYNCABLE_PREF);
 }
 
 bool ThemeServiceFactory::ServiceRedirectedInIncognito() const {
   return true;
 }