Change ThemeService to handle uninstalled themes.

chrome/browser/extensions/extension_service.cc

Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index fac49f28d5d64d1bae52185f2c766a52f764ca9a..23908888e1244c7b75983e66f912e96f3b7643ae 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -1168,6 +1168,16 @@ void ExtensionService::NotifyExtensionUnloaded(
       content::Source<Profile>(profile_),
       content::Details<UnloadedExtensionInfo>(&details));
 
+#if defined(ENABLE_THEMES)
+  // Let the ThemeService know that the theme has been unloaded.
+  if (reason != extension_misc::UNLOAD_REASON_UPDATE &&
+      extension->is_theme()) {
+    ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile_);

[akalin, 2012/11/29 20:40:12]

can you use ThemeService::GetThemeIDForProfile()? (I'm supposed to change all
callers to use that anyway)  Something like:

if (... extension->is_theme() && extension->id() ==
ThemeService::GetThemeIDForProfile(profile_)) {
  ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme();
}

I was gonna suggest adding something like TSF::UseDefaultThemeForProfile, but I
guess at this point you know that the ThemeService is already loaded.

[Andrew T Wilson (Slow), 2012/11/30 12:44:55]

Done. If you are concerned about startup regressions, I don't think it's an
issue since at worst case this would force ThemeService to be loaded in the case
that the theme was uninstalled somehow while the browser was shutdown.

+    if (extension->id() == theme_service->GetThemeID())
+      theme_service->UseDefaultTheme();
+  }
+#endif
+
   for (content::RenderProcessHost::iterator i(
           content::RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {