diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-21 18:25:34 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-21 18:25:34 +0000 |
| commit | bc118e52c97b739a72a0987a368075429e923ba6 (patch) | |
| tree | 8a4643f292fd61d2d7342562a88e9df51f06522a /extensions/browser | |
| parent | 3b09d5e1d53f61291e20e2701c4ada568a2ae765 (diff) | |
| download | chromium_src-bc118e52c97b739a72a0987a368075429e923ba6.zip chromium_src-bc118e52c97b739a72a0987a368075429e923ba6.tar.gz chromium_src-bc118e52c97b739a72a0987a368075429e923ba6.tar.bz2 | |
Revert of Unload all apps / extensions when deleting a profile. (https://codereview.chromium.org/266343002/)
Reason for revert:
Caused crash in official builds when deleting profiles while the chrome:chrome-signin tab is open
BUG=374683
TBR=kalman, sky
Original issue's description:
> Unload all apps / extensions immediately when deleting a profile.
>
> Previously apps could remain running with references to profiles that had been deleted by users, but before the browser shut down and profiles were fully removed. Problems included E.g. opening a link in an app would open a tab in the deleted profile.
>
> Relanding patch: ShutdownStartupCycle failed in build [49353], this patch was speculatively reverted in r269383 [49355], but ShutdownStartupCycle failed again in [49362] after the revert had landed.
>
> [49353] http://build.chromium.org/p/chromium.mac/builders/Mac%2010.6%20Tests%20%28dbg%29%281%29/builds/49353
> [49355] http://build.chromium.org/p/chromium.mac/builders/Mac%2010.6%20Tests%20%28dbg%29%281%29/builds/49355
> [49362] http://build.chromium.org/p/chromium.mac/builders/Mac%2010.6%20Tests%20%28dbg%29%281%29/builds/49362
>
> BUG=368684
> TEST=Manual testing as described on http://crbug.com/368684#c1
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=269343
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=270890
Review URL: https://codereview.chromium.org/289283013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/browser')
| -rw-r--r-- | extensions/browser/process_manager.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/extensions/browser/process_manager.cc b/extensions/browser/process_manager.cc index b110aa3..9e5f0c6 100644 --- a/extensions/browser/process_manager.cc +++ b/extensions/browser/process_manager.cc @@ -436,10 +436,7 @@ void ProcessManager::DecrementLazyKeepaliveCount(const Extension* extension) { void ProcessManager::DecrementLazyKeepaliveCount( const std::string& extension_id) { int& count = background_page_data_[extension_id].lazy_keepalive_count; - DCHECK(count > 0 || - !ExtensionRegistry::Get(GetBrowserContext()) - ->enabled_extensions() - .Contains(extension_id)); + DCHECK_GT(count, 0); // If we reach a zero keepalive count when the lazy background page is about // to be closed, incrementing close_sequence_id will cancel the close |