| Index: chrome/browser/extensions/extension_service.cc
|
| diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
|
| index 5c05c6cb9b16dba738258e193fd3224aac37b1c0..192658b323a2b1444f8739e677a7b88c634d9273 100644
|
| --- a/chrome/browser/extensions/extension_service.cc
|
| +++ b/chrome/browser/extensions/extension_service.cc
|
| @@ -1077,7 +1077,7 @@ const Extension* ExtensionService::LoadComponentExtension(
|
| JSONStringValueSerializer serializer(info.manifest);
|
| scoped_ptr<Value> manifest(serializer.Deserialize(NULL, NULL));
|
| if (!manifest.get()) {
|
| - DLOG(ERROR) << "Failed to parse manifest for extension";
|
| + LOG(ERROR) << "Failed to parse manifest for extension";
|
| return NULL;
|
| }
|
|
|
| @@ -1092,7 +1092,7 @@ const Extension* ExtensionService::LoadComponentExtension(
|
| flags,
|
| &error));
|
| if (!extension.get()) {
|
| - NOTREACHED() << error;
|
| + LOG(ERROR) << error;
|
| return NULL;
|
| }
|
| AddExtension(extension);
|
| @@ -1104,7 +1104,7 @@ void ExtensionService::UnloadComponentExtension(
|
| JSONStringValueSerializer serializer(info.manifest);
|
| scoped_ptr<Value> manifest(serializer.Deserialize(NULL, NULL));
|
| if (!manifest.get()) {
|
| - DLOG(ERROR) << "Failed to parse manifest for extension";
|
| + LOG(ERROR) << "Failed to parse manifest for extension";
|
| return;
|
| }
|
| std::string public_key;
|
| @@ -1114,7 +1114,7 @@ void ExtensionService::UnloadComponentExtension(
|
| GetString(extension_manifest_keys::kPublicKey, &public_key) ||
|
| !Extension::ParsePEMKeyBytes(public_key, &public_key_bytes) ||
|
| !Extension::GenerateId(public_key_bytes, &id)) {
|
| - DLOG(ERROR) << "Failed to get extension id";
|
| + LOG(ERROR) << "Failed to get extension id";
|
| return;
|
| }
|
| UnloadExtension(id, UnloadedExtensionInfo::DISABLE);
|
|
|