diff options
| author | clamy@chromium.org <clamy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-28 01:52:24 +0000 |
|---|---|---|
| committer | clamy@chromium.org <clamy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-28 01:52:24 +0000 |
| commit | 21b41c7e89c864e8bd5da8e4f81c38043eba83c5 (patch) | |
| tree | 7be7e64a9a8e63ea75984ce7799ac615c0b1196b /chrome/browser/renderer_host/web_cache_manager_browsertest.cc | |
| parent | 82590814af33f91394e590df8a2b14c208563989 (diff) | |
| download | chromium_src-21b41c7e89c864e8bd5da8e4f81c38043eba83c5.zip chromium_src-21b41c7e89c864e8bd5da8e4f81c38043eba83c5.tar.gz chromium_src-21b41c7e89c864e8bd5da8e4f81c38043eba83c5.tar.bz2 | |
Revert "Revert 249676 "Have the unload event execute in background on cr...""
This fixes a bug in the original CL which may have caused a crash in
ProfileDestroyer.
BUG=343002,323528,342361
Review URL: https://codereview.chromium.org/180993003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/web_cache_manager_browsertest.cc')
| -rw-r--r-- | chrome/browser/renderer_host/web_cache_manager_browsertest.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/renderer_host/web_cache_manager_browsertest.cc b/chrome/browser/renderer_host/web_cache_manager_browsertest.cc index a917ed5..7caee2f 100644 --- a/chrome/browser/renderer_host/web_cache_manager_browsertest.cc +++ b/chrome/browser/renderer_host/web_cache_manager_browsertest.cc @@ -57,10 +57,13 @@ IN_PROC_BROWSER_TEST_F(WebCacheManagerBrowserTest, CrashOnceOnly) { ui_test_utils::NavigateToURL(browser(), url); - EXPECT_EQ( - WebCacheManager::GetInstance()->active_renderers_.size(), 1U); + // Depending on the speed of execution of the unload event, we may have one or + // two active renderers at that point (one executing the unload event in + // background). + EXPECT_GE(WebCacheManager::GetInstance()->active_renderers_.size(), 1U); + EXPECT_LE(WebCacheManager::GetInstance()->active_renderers_.size(), 2U); EXPECT_EQ( WebCacheManager::GetInstance()->inactive_renderers_.size(), 0U); - EXPECT_EQ( - WebCacheManager::GetInstance()->stats_.size(), 1U); + EXPECT_GE(WebCacheManager::GetInstance()->stats_.size(), 1U); + EXPECT_LE(WebCacheManager::GetInstance()->stats_.size(), 2U); } |