Index: chrome/browser/extensions/extensions_service.cc |
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc |
index de783660e01ae2fbb4452ab73846d14586c610b4..756c750613f9eca7efa4a20b85b2939055d54f8f 100644 |
--- a/chrome/browser/extensions/extensions_service.cc |
+++ b/chrome/browser/extensions/extensions_service.cc |
@@ -421,7 +421,7 @@ void ExtensionsService::LoadComponentExtensions() { |
component_extension_manifests_.begin(); |
it != component_extension_manifests_.end(); ++it) { |
JSONStringValueSerializer serializer(it->manifest); |
- scoped_ptr<Value> manifest(serializer.Deserialize(NULL)); |
+ scoped_ptr<Value> manifest(serializer.Deserialize(NULL, NULL)); |
if (!manifest.get()) { |
NOTREACHED() << "Failed to retrieve manifest for extension"; |
continue; |
@@ -757,6 +757,9 @@ void ExtensionsService::ReloadExtensions() { |
} |
void ExtensionsService::GarbageCollectExtensions() { |
+ if (extension_prefs_->pref_service()->read_only()) |
+ return; |
+ |
InstalledExtensionSet installed(extension_prefs_.get()); |
ChromeThread::PostTask( |
ChromeThread::FILE, FROM_HERE, |