Index: chrome/browser/extensions/extension_system.cc |
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc |
index b451ab02005721d23331f94c8df11fdd302e5d42..1126607e40b3f21139ea7a817f2987b0f7c6acfd 100644 |
--- a/chrome/browser/extensions/extension_system.cc |
+++ b/chrome/browser/extensions/extension_system.cc |
@@ -95,12 +95,6 @@ void ExtensionSystemImpl::Shared::RegisterManagementPolicyProviders() { |
management_policy_->RegisterProvider(extension_prefs_.get()); |
} |
-void ExtensionSystemImpl::Shared::InitInfoMap() { |
- // The ExtensionInfoMap needs to be created before the |
- // ExtensionProcessManager. |
- extension_info_map_ = new ExtensionInfoMap(); |
-} |
- |
void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { |
const CommandLine* command_line = CommandLine::ForCurrentProcess(); |
@@ -215,6 +209,8 @@ UserScriptMaster* ExtensionSystemImpl::Shared::user_script_master() { |
} |
ExtensionInfoMap* ExtensionSystemImpl::Shared::info_map() { |
+ if (!extension_info_map_) |
+ extension_info_map_ = new ExtensionInfoMap(); |
return extension_info_map_.get(); |
} |
@@ -267,7 +263,9 @@ void ExtensionSystemImpl::InitForRegularProfile(bool extensions_enabled) { |
extension_devtools_manager_ = new ExtensionDevToolsManager(profile_); |
} |
- shared_->InitInfoMap(); |
+ // The ExtensionInfoMap needs to be created before the |
+ // ExtensionProcessManager. |
+ shared_->info_map(); |
extension_process_manager_.reset(ExtensionProcessManager::Create(profile_)); |
alarm_manager_.reset(new AlarmManager(profile_, &base::Time::Now)); |