Clean up a few startup and shutdown dependencies which should fix some of the...

chrome/browser/extensions/extension_process_manager.cc

 // Copyright (c) 2009 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_process_manager.h"
 
 #include "chrome/browser/browsing_instance.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 
 static void CreateBackgroundHosts(
     ExtensionProcessManager* manager, const ExtensionList* extensions) {
   for (ExtensionList::const_iterator extension = extensions->begin();
        extension != extensions->end(); ++extension) {
     // Start the process for the master page, if it exists.
     if ((*extension)->background_url().is_valid())
       manager->CreateBackgroundHost(*extension, (*extension)->background_url());
   }
 }
 
 ExtensionProcessManager::ExtensionProcessManager(Profile* profile)
     : browsing_instance_(new BrowsingInstance(profile)) {
+  registrar_.Add(this, NotificationType::EXTENSIONS_READY,
+                 NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSIONS_LOADED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
                  NotificationService::AllSources());
 
-  if (profile->GetExtensionsService())
-    CreateBackgroundHosts(this, profile->GetExtensionsService()->extensions());
+  ExtensionsService* service = profile->GetExtensionsService();
+  if (service && service->is_ready())

[rafaelw, 2009/06/24 23:04:22]

Can this test ever return true?

[Erik does not do reviews, 2009/06/25 16:19:08]

Good point.  It can't any more.  I'll fix this in a follow-on.

+    CreateBackgroundHosts(this, service->extensions());
 }
 
 ExtensionProcessManager::~ExtensionProcessManager() {
   // Copy all_hosts_ to avoid iterator invalidation issues.
-  ExtensionHostSet to_delete(all_hosts_.begin(),
-                             all_hosts_.end());
+  ExtensionHostSet to_delete(background_hosts_.begin(),
+                             background_hosts_.end());
   ExtensionHostSet::iterator iter;
   for (iter = to_delete.begin(); iter != to_delete.end(); ++iter)
     delete *iter;
 }
 
 ExtensionHost* ExtensionProcessManager::CreateView(Extension* extension,
                                                    const GURL& url,
                                                    Browser* browser) {
   DCHECK(extension);
   DCHECK(browser);
@@ skipping 27 matching lines @@
 }
 
 SiteInstance* ExtensionProcessManager::GetSiteInstanceForURL(const GURL& url) {
   return browsing_instance_->GetSiteInstanceForURL(url);
 }
 
 void ExtensionProcessManager::Observe(NotificationType type,
                                       const NotificationSource& source,
                                       const NotificationDetails& details) {
   switch (type.value) {
+    case NotificationType::EXTENSIONS_READY:
+      CreateBackgroundHosts(this,
+          Source<ExtensionsService>(source).ptr()->extensions());
+      break;
+
     case NotificationType::EXTENSIONS_LOADED: {
-      const ExtensionList* extensions = Details<ExtensionList>(details).ptr();
-      CreateBackgroundHosts(this, extensions);
+      ExtensionsService* service = Source<ExtensionsService>(source).ptr();
+      if (service->is_ready()) {
+        const ExtensionList* extensions = Details<ExtensionList>(details).ptr();
+        CreateBackgroundHosts(this, extensions);
+      }
       break;
     }
 
     case NotificationType::EXTENSION_UNLOADED: {
       Extension* extension = Details<Extension>(details).ptr();
       for (ExtensionHostSet::iterator iter = background_hosts_.begin();
            iter != background_hosts_.end(); ++iter) {
         ExtensionHost* host = *iter;
         if (host->extension()->id() == extension->id()) {
           delete host;
@@ skipping 36 matching lines @@
 void ExtensionProcessManager::OnExtensionHostCreated(ExtensionHost* host,
                                                      bool is_background) {
   all_hosts_.insert(host);
   if (is_background)
     background_hosts_.insert(host);
   NotificationService::current()->Notify(
       NotificationType::EXTENSION_HOST_CREATED,
       Source<ExtensionProcessManager>(this),
       Details<ExtensionHost>(host));
 }