summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorcreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 17:01:58 +0000
committercreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 17:01:58 +0000
commit1530fbc56b9567946c82457fd5537c969cfcd3da (patch)
tree8866fd4b5e844bb8fb4ac600223839991dae8f1d /content
parente63f8f91fba1f7b3e5141abb1a747fb7931edd91 (diff)
downloadchromium_src-1530fbc56b9567946c82457fd5537c969cfcd3da.zip
chromium_src-1530fbc56b9567946c82457fd5537c969cfcd3da.tar.gz
chromium_src-1530fbc56b9567946c82457fd5537c969cfcd3da.tar.bz2
Revert 132852 - Removing the actual process termination to diagnose the kill rate.
Reverting along with 132407 due to suspected impact on stability numbers. BUG=104346 TEST=None Review URL: https://chromiumcodereview.appspot.com/10021058 Patch from Nasko Oskov <nasko@chromium.org>. TBR=creis@chromium.org Review URL: https://chromiumcodereview.appspot.com/10383111 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/render_view_host_browsertest.cc7
-rw-r--r--content/browser/renderer_host/render_view_host_impl.cc5
2 files changed, 3 insertions, 9 deletions
diff --git a/content/browser/renderer_host/render_view_host_browsertest.cc b/content/browser/renderer_host/render_view_host_browsertest.cc
index a0f3ee1..effdbb8 100644
--- a/content/browser/renderer_host/render_view_host_browsertest.cc
+++ b/content/browser/renderer_host/render_view_host_browsertest.cc
@@ -232,9 +232,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostTest, BaseURLParam) {
// Test that a hung renderer is killed after navigating away during cross-site
// navigation.
-// Disabling until actual process termination is enabled back. crbug.com/104346
-IN_PROC_BROWSER_TEST_F(RenderViewHostTest,
- DISABLED_UnresponsiveCrossSiteNavigation) {
+IN_PROC_BROWSER_TEST_F(RenderViewHostTest, UnresponsiveCrossSiteNavigation) {
WebContents* web_contents = NULL;
WebContents* web_contents_2 = NULL;
content::RenderProcessHost* rph = NULL;
@@ -321,8 +319,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostTest,
}
// Test that a hung renderer is killed when we are closing the page.
-// Disabling until actual process termination is enabled back. crbug.com/104346
-IN_PROC_BROWSER_TEST_F(RenderViewHostTest, DISABLED_UnresponsiveClosePage) {
+IN_PROC_BROWSER_TEST_F(RenderViewHostTest, UnresponsiveClosePage) {
WebContents* web_contents = NULL;
FilePath doc_root;
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index fb2a078..62ef275 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -500,10 +500,7 @@ void RenderViewHostImpl::WasSwappedOut() {
// beforeunload handler completes fine, but the unload handler hangs.
// At this time, the complexity to solve this edge case is not worthwhile.
if (SuddenTerminationAllowed()) {
- // We should kill the process, but for now, just log the data so we can
- // diagnose the kill rate and investigate if separate timer is needed.
- // http://crbug.com/104346.
-
+ base::KillProcess(process_handle, content::RESULT_CODE_HUNG, false);
// Log a histogram point to help us diagnose how many of those kills
// we have performed. 1 is the enum value for RendererType Normal for
// the histogram.