Index: chrome/browser/extensions/extension_system.cc |
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc |
index 80ef73657ddb1303dfe8e05e28956ea460d28e31..885b6c50ae93632741e1e0f2c8eaaea92e2e64be 100644 |
--- a/chrome/browser/extensions/extension_system.cc |
+++ b/chrome/browser/extensions/extension_system.cc |
@@ -39,10 +39,12 @@ |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/url_data_source.h" |
#include "extensions/browser/event_router.h" |
+#include "extensions/browser/extension_registry.h" |
#include "extensions/browser/info_map.h" |
#include "extensions/browser/lazy_background_task_queue.h" |
#include "extensions/browser/management_policy.h" |
#include "extensions/browser/process_manager.h" |
+#include "extensions/browser/runtime_data.h" |
#include "extensions/common/constants.h" |
#include "extensions/common/extension.h" |
#include "extensions/common/manifest.h" |
@@ -168,6 +170,9 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { |
user_script_master_ = new UserScriptMaster(profile_); |
+ // ExtensionService depends on RuntimeData. |
+ runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_))); |
+ |
bool autoupdate_enabled = true; |
#if defined(OS_CHROMEOS) |
if (!extensions_enabled) |
@@ -279,6 +284,10 @@ ExtensionService* ExtensionSystemImpl::Shared::extension_service() { |
return extension_service_.get(); |
} |
+RuntimeData* ExtensionSystemImpl::Shared::runtime_data() { |
+ return runtime_data_.get(); |
+} |
+ |
ManagementPolicy* ExtensionSystemImpl::Shared::management_policy() { |
return management_policy_.get(); |
} |
@@ -357,6 +366,10 @@ ExtensionService* ExtensionSystemImpl::extension_service() { |
return shared_->extension_service(); |
} |
+RuntimeData* ExtensionSystemImpl::runtime_data() { |
+ return shared_->runtime_data(); |
+} |
+ |
ManagementPolicy* ExtensionSystemImpl::management_policy() { |
return shared_->management_policy(); |
} |