Merge 84502 - avoid dereferencing NULL extension in ExtensionHost

chrome/browser/extensions/extension_process_manager.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/extensions/extension_process_manager.h"
 
 #include "chrome/browser/ui/browser_window.h"
 #include "content/browser/browsing_instance.h"
 #if defined(OS_MACOSX)
 #include "chrome/browser/extensions/extension_host_mac.h"
@@ skipping 288 matching lines @@
       }
       break;
     }
 
     case NotificationType::EXTENSION_UNLOADED: {
       const Extension* extension =
           Details<UnloadedExtensionInfo>(details)->extension;
       for (ExtensionHostSet::iterator iter = background_hosts_.begin();
            iter != background_hosts_.end(); ++iter) {
         ExtensionHost* host = *iter;
-        if (host->extension()->id() == extension->id()) {
+        if (host->extension_id() == extension->id()) {
           delete host;
           // |host| should deregister itself from our structures.
           DCHECK(background_hosts_.find(host) == background_hosts_.end());
           break;
         }
       }
       break;
     }
 
     case NotificationType::EXTENSION_HOST_DESTROYED: {
@@ skipping 147 matching lines @@
         if (service && service->is_ready())
           CreateBackgroundHosts(this, service->extensions());
       }
       break;
     }
     default:
       ExtensionProcessManager::Observe(type, source, details);
       break;
   }
 }