Change ThemeService to handle uninstalled themes.

chrome/browser/extensions/extension_service.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/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 1150 matching lines @@
 
 void ExtensionService::NotifyExtensionUnloaded(
     const Extension* extension,
     extension_misc::UnloadedExtensionReason reason) {
   UnloadedExtensionInfo details(extension, reason);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_UNLOADED,
       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()) {
     content::RenderProcessHost* host = i.GetCurrentValue();
     Profile* host_profile =
         Profile::FromBrowserContext(host->GetBrowserContext());
     if (host_profile->GetOriginalProfile() == profile_->GetOriginalProfile())
       host->Send(new ExtensionMsg_Unloaded(extension->id()));
   }
 
@@ skipping 1804 matching lines @@
         extension_id, kOnUpdateAvailableEvent);
   } else {
     // Delay installation if the extension is not idle.
     return !IsExtensionIdle(extension_id);
   }
 }
 
 void ExtensionService::OnBlacklistUpdated() {
   CheckManagementPolicy();
 }