| Index: chrome/browser/extensions/extension_service.cc
|
| diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
|
| index 42cad4fd3d2f32ef34a3611f11d7c98a7992d49b..104423d7d9c3cf1bef3fd70551e09df5fdc67ff9 100644
|
| --- a/chrome/browser/extensions/extension_service.cc
|
| +++ b/chrome/browser/extensions/extension_service.cc
|
| @@ -1588,8 +1588,9 @@ void ExtensionService::OnExtensionInstalled(
|
| const std::string& id = extension->id();
|
| bool initial_enable = ShouldEnableOnInstall(extension);
|
| std::string install_parameter;
|
| - const extensions::PendingExtensionInfo* pending_extension_info = NULL;
|
| - if ((pending_extension_info = pending_extension_manager()->GetById(id))) {
|
| + const extensions::PendingExtensionInfo* pending_extension_info =
|
| + pending_extension_manager()->GetById(id);
|
| + if (pending_extension_info) {
|
| if (!pending_extension_info->ShouldAllowInstall(extension)) {
|
| pending_extension_manager()->Remove(id);
|
|
|
|
|