| Index: chrome/browser/extensions/extension_process_manager.cc
 | 
| ===================================================================
 | 
| --- chrome/browser/extensions/extension_process_manager.cc	(revision 152126)
 | 
| +++ chrome/browser/extensions/extension_process_manager.cc	(working copy)
 | 
| @@ -10,7 +10,6 @@
 | 
|  #include "base/metrics/histogram.h"
 | 
|  #include "base/string_number_conversions.h"
 | 
|  #include "base/time.h"
 | 
| -#include "chrome/browser/extensions/api/runtime/runtime_api.h"
 | 
|  #include "chrome/browser/extensions/extension_process_manager.h"
 | 
|  #include "chrome/browser/extensions/extension_host.h"
 | 
|  #include "chrome/browser/extensions/extension_info_map.h"
 | 
| @@ -90,20 +89,16 @@
 | 
|  
 | 
|  static void CreateBackgroundHostForExtensionLoad(
 | 
|      ExtensionProcessManager* manager, const Extension* extension) {
 | 
| -  if (extension->has_persistent_background_page())
 | 
| +  if (extension->has_persistent_background_page()) {
 | 
|      manager->CreateBackgroundHost(extension, extension->GetBackgroundURL());
 | 
| +  }
 | 
|  }
 | 
|  
 | 
|  static void CreateBackgroundHostsForProfileStartup(
 | 
| -    Profile* profile,
 | 
| -    ExtensionProcessManager* manager,
 | 
| -    const ExtensionSet* extensions) {
 | 
| +    ExtensionProcessManager* manager, const ExtensionSet* extensions) {
 | 
|    for (ExtensionSet::const_iterator extension = extensions->begin();
 | 
|         extension != extensions->end(); ++extension) {
 | 
|      CreateBackgroundHostForExtensionLoad(manager, *extension);
 | 
| -
 | 
| -    extensions::RuntimeEventRouter::DispatchOnStartupEvent(
 | 
| -        profile, (*extension)->id());
 | 
|    }
 | 
|  }
 | 
|  
 | 
| @@ -562,19 +557,19 @@
 | 
|      const content::NotificationDetails& details) {
 | 
|    switch (type) {
 | 
|      case chrome::NOTIFICATION_EXTENSIONS_READY: {
 | 
| -      Profile* profile = content::Source<Profile>(source).ptr();
 | 
| -      CreateBackgroundHostsForProfileStartup(profile, this,
 | 
| -          profile->GetExtensionService()->extensions());
 | 
| +      CreateBackgroundHostsForProfileStartup(this,
 | 
| +          content::Source<Profile>(source).ptr()->
 | 
| +              GetExtensionService()->extensions());
 | 
|        break;
 | 
|      }
 | 
|  
 | 
|      case chrome::NOTIFICATION_EXTENSION_LOADED: {
 | 
| -      Profile* profile = content::Source<Profile>(source).ptr();
 | 
| -      ExtensionService* service = profile->GetExtensionService();
 | 
| +      ExtensionService* service =
 | 
| +          content::Source<Profile>(source).ptr()->GetExtensionService();
 | 
|        if (service->is_ready()) {
 | 
|          const Extension* extension =
 | 
|              content::Details<const Extension>(details).ptr();
 | 
| -        CreateBackgroundHostForExtensionLoad(this, extension);
 | 
| +        ::CreateBackgroundHostForExtensionLoad(this, extension);
 | 
|        }
 | 
|        break;
 | 
|      }
 | 
| @@ -810,8 +805,7 @@
 | 
|          // service will be NULL.
 | 
|          ExtensionService* service = GetProfile()->GetExtensionService();
 | 
|          if (service && service->is_ready())
 | 
| -          CreateBackgroundHostsForProfileStartup(GetProfile(),
 | 
| -                                                 this, service->extensions());
 | 
| +          CreateBackgroundHostsForProfileStartup(this, service->extensions());
 | 
|        }
 | 
|        break;
 | 
|      }
 | 
| 
 |