summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host/web_cache_manager_browsertest.cc
diff options
context:
space:
mode:
authorcreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-24 22:53:26 +0000
committercreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-24 22:53:26 +0000
commit7e8ac7b1c05ce26761b13577290bae8b7ad2ea87 (patch)
tree540fd168b0f6ae8866969d13faf2ffee5ddaffa1 /chrome/browser/renderer_host/web_cache_manager_browsertest.cc
parent54199868a48747959568c1ee4116eff33860b79e (diff)
downloadchromium_src-7e8ac7b1c05ce26761b13577290bae8b7ad2ea87.zip
chromium_src-7e8ac7b1c05ce26761b13577290bae8b7ad2ea87.tar.gz
chromium_src-7e8ac7b1c05ce26761b13577290bae8b7ad2ea87.tar.bz2
Revert 249676 "Have the unload event execute in background on cr..."
Speculative revert to see if it resolves bug 345757. Suspected because UnregisterRenderFrameHost could lead to RenderViewHost outliving WebContents, causing at least some of the ObserverListBase crashes we're seeing. > Have the unload event execute in background on cross-site navigations > > Cross-site navigations trigger renderer swap. This CL makes it so that the swap > does not need for the old renderer unload event to be fired. Instead, it will > be executed in the background, and the new renderer will be swapped in > immediately. > BUG=323528 > > Review URL: https://codereview.chromium.org/88503002 TBR=clamy@chromium.org Review URL: https://codereview.chromium.org/177093009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253018 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.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/renderer_host/web_cache_manager_browsertest.cc b/chrome/browser/renderer_host/web_cache_manager_browsertest.cc
index 7caee2f..a917ed5 100644
--- a/chrome/browser/renderer_host/web_cache_manager_browsertest.cc
+++ b/chrome/browser/renderer_host/web_cache_manager_browsertest.cc
@@ -57,13 +57,10 @@ IN_PROC_BROWSER_TEST_F(WebCacheManagerBrowserTest, CrashOnceOnly) {
ui_test_utils::NavigateToURL(browser(), url);
- // 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()->active_renderers_.size(), 1U);
EXPECT_EQ(
WebCacheManager::GetInstance()->inactive_renderers_.size(), 0U);
- EXPECT_GE(WebCacheManager::GetInstance()->stats_.size(), 1U);
- EXPECT_LE(WebCacheManager::GetInstance()->stats_.size(), 2U);
+ EXPECT_EQ(
+ WebCacheManager::GetInstance()->stats_.size(), 1U);
}