Index: chrome/browser/extensions/installed_loader.cc |
diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc |
index 363c7d3d8e31ca58070080fca7cc73485e676b4b..71fc70ef12cff1997e72f12ef75e3d519bdd9a1c 100644 |
--- a/chrome/browser/extensions/installed_loader.cc |
+++ b/chrome/browser/extensions/installed_loader.cc |
@@ -202,7 +202,8 @@ void InstalledLoader::Load(const ExtensionInfo& info, bool write_to_prefs) { |
error = errors::kDisabledByPolicy; |
extension = NULL; |
} else if (!extension_prefs_->IsExtensionDisabled(extension->id()) && |
- policy->MustRemainDisabled(extension, &disable_reason, NULL)) { |
+ policy->MustRemainDisabled( |
+ extension.get(), &disable_reason, NULL)) { |
extension_prefs_->SetExtensionState(extension->id(), Extension::DISABLED); |
extension_prefs_->AddDisableReason(extension->id(), disable_reason); |
force_disabled = true; |
@@ -330,7 +331,7 @@ void InstalledLoader::LoadAllExtensions() { |
for (ExtensionSet::const_iterator iter = extensions.begin(); |
iter != extensions.end(); |
++iter) { |
- const Extension* extension = *iter; |
+ const Extension* extension = iter->get(); |
Manifest::Location location = extension->location(); |
Manifest::Type type = extension->GetType(); |
@@ -498,7 +499,7 @@ void InstalledLoader::LoadAllExtensions() { |
RecordDisableReasons(extension_prefs_->GetDisableReasons((*ex)->id())); |
if (Manifest::IsExternalLocation((*ex)->location())) { |
// See loop above for ENABLED. |
- if (ManifestURL::UpdatesFromGallery(*ex)) { |
+ if (ManifestURL::UpdatesFromGallery(ex->get())) { |
UMA_HISTOGRAM_ENUMERATION("Extensions.ExternalItemState", |
EXTERNAL_ITEM_WEBSTORE_DISABLED, |
EXTERNAL_ITEM_MAX_ITEMS); |