diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 16:27:01 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 16:27:01 +0000 |
commit | 597cceb53e5387141246e20a4fc196611e391046 (patch) | |
tree | dfe493a6710cf3e6eded71a76b5dbcca82917306 /chrome/browser | |
parent | b2c93bce58a14dc268522abaa57c931bdea4f83c (diff) | |
download | chromium_src-597cceb53e5387141246e20a4fc196611e391046.zip chromium_src-597cceb53e5387141246e20a4fc196611e391046.tar.gz chromium_src-597cceb53e5387141246e20a4fc196611e391046.tar.bz2 |
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
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/extensions/extensions_service.cc | 18 |
1 files changed, 1 insertions, 17 deletions
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<Profile>(source).ptr()); - ExtensionHost* host = Details<ExtensionHost>(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<ExtensionHost>(details).ptr()->extension()->id()); break; } |