diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 22:51:52 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 22:51:52 +0000 |
| commit | 37e056b784278969c38867c8f9d3ede2775beef8 (patch) | |
| tree | 508847fe6045678992b538d037725ddcfeb03e6f /content | |
| parent | d0a0bf2ae9b4431e994291f3cc8f76ca04691127 (diff) | |
| download | chromium_src-37e056b784278969c38867c8f9d3ede2775beef8.zip chromium_src-37e056b784278969c38867c8f9d3ede2775beef8.tar.gz chromium_src-37e056b784278969c38867c8f9d3ede2775beef8.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/10392038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_view_host_browsertest.cc | 7 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_view_host_impl.cc | 5 |
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 7d5235a..bd27a6e 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -499,10 +499,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. |