Index: chrome/browser/extensions/installed_loader.cc |
diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc |
index b68cfa22cc62adc6aade62ba91da5f02dc9bd6bb..d05be4d05f1b6f40e4dd89fe3bf6d13a273910d8 100644 |
--- a/chrome/browser/extensions/installed_loader.cc |
+++ b/chrome/browser/extensions/installed_loader.cc |
@@ -117,7 +117,7 @@ BackgroundPageType GetBackgroundPageType(const Extension* extension) { |
InstalledLoader::InstalledLoader(ExtensionService* extension_service) |
: extension_service_(extension_service), |
- extension_prefs_(extension_service->extension_prefs()) { |
+ extension_prefs_(ExtensionPrefs::Get(extension_service->profile())) { |
} |
InstalledLoader::~InstalledLoader() { |
@@ -411,8 +411,7 @@ void InstalledLoader::LoadAllExtensions() { |
extension_service_->disabled_extensions(); |
for (ex = disabled_extensions->begin(); |
ex != disabled_extensions->end(); ++ex) { |
- if (extension_service_->extension_prefs()-> |
- DidExtensionEscalatePermissions((*ex)->id())) { |
+ if (extension_prefs_->DidExtensionEscalatePermissions((*ex)->id())) { |
++disabled_for_permissions_count; |
} |
if (Manifest::IsExternalLocation((*ex)->location())) { |