From 597cceb53e5387141246e20a4fc196611e391046 Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Mon, 22 Mar 2010 16:27:01 +0000 Subject: Clean up the extensions service after fixing the bug. This removes excessive debugging code I added to gather more info about the crashes. They have now disappeared, and the checks obscure the code now. TEST=extension browser tests, unit_tests, etc BUG=30405 Review URL: http://codereview.chromium.org/1078006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42221 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extensions_service.cc | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'chrome') diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc index 3d72258..3867ee3 100644 --- a/chrome/browser/extensions/extensions_service.cc +++ b/chrome/browser/extensions/extensions_service.cc @@ -947,25 +947,9 @@ void ExtensionsService::Observe(NotificationType type, case NotificationType::EXTENSION_PROCESS_TERMINATED: { DCHECK_EQ(profile_, Source(source).ptr()); - ExtensionHost* host = Details(details).ptr(); - // TODO(phajdan.jr): Change to DCHECK after fixing http://crbug.com/30405. - CHECK(profile_->GetExtensionProcessManager()->HasExtensionHost(host)); - - // If we hit one of these assertions it means that the host's - // Extension pointer became invalid. http://crbug.com/30405 - // TODO(phajdan.jr): Remove excessive debugging after fixing bug 30405. - std::string extension_id(host->extension()->id()); - CHECK(extension_id.length() == 32U); - Extension* extension = GetExtensionById(extension_id, true); - CHECK(extension == host->extension()); - if (!extension) { - NOTREACHED(); - return; - } - // Unload the entire extension. We want it to be in a consistent state: // either fully working or not loaded at all, but never half-crashed. - UnloadExtension(extension_id); + UnloadExtension(Details(details).ptr()->extension()->id()); break; } -- cgit v1.1