Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(659)

Unified Diff: content/browser/renderer_host/render_process_host_browsertest.cc

Issue 9514016: Fixing a problem, where a hung renderer process is not killed when navigating away (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Incorporating Charlie's feedback. Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_process_host_browsertest.cc
diff --git a/content/browser/renderer_host/render_process_host_browsertest.cc b/content/browser/renderer_host/render_process_host_browsertest.cc
index 50de34073b0031c3496facd661518a1230b6af2c..995b0dc92f9e11d0923ca5a6213d929638a77045 100644
--- a/content/browser/renderer_host/render_process_host_browsertest.cc
+++ b/content/browser/renderer_host/render_process_host_browsertest.cc
@@ -15,6 +15,7 @@
#include "content/common/test_url_constants.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_switches.h"
+#include "net/test/test_server.h"
using content::WebContents;
@@ -252,3 +253,65 @@ IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, ProcessOverflow) {
IN_PROC_BROWSER_TEST_F(RenderProcessHostTestWithCommandLine, ProcessOverflow) {
TestProcessOverflow();
}
+
+IN_PROC_BROWSER_TEST_F(RenderProcessHostTest, UnresponsiveCrossSiteNavigation) {
+ WebContents* tab = NULL;
+ WebContents* tab2 = NULL;
+ content::RenderProcessHost* rph = NULL;
+ base::ProcessHandle process = NULL;
+
+ // Start two servers to enable cross-site navigations.
+ ASSERT_TRUE(test_server()->Start());
+ net::TestServer https_server(
+ net::TestServer::TYPE_HTTPS,
+ net::TestServer::kLocalhost,
+ FilePath(FILE_PATH_LITERAL("chrome/test/data")));
jam 2012/03/02 00:21:10 please don't hard code paths in tests. can you p
nasko 2012/03/02 18:40:36 I've moved the files to the content/test/data, but
+ ASSERT_TRUE(https_server.Start());
+
+ GURL infinite_beforeunload_url(
+ test_server()->GetURL("files/infinite_beforeunload.html"));
+ GURL infinite_unload_url(test_server()->GetURL("files/infinite_unload.html"));
+ GURL same_process_url(test_server()->GetURL("files/english_page.html"));
+ GURL new_process_url(https_server.GetURL("files/english_page.html"));
+
+ // Navigate the tab to the page which will lock up the process when we
+ // navigate away from it.
+ ui_test_utils::NavigateToURL(browser(), infinite_unload_url);
+ tab = browser()->GetWebContentsAt(0);
+ rph = tab->GetRenderProcessHost();
+ EXPECT_EQ(tab->GetURL(), infinite_unload_url);
+
+ // Remember the process prior to navigation, as we expect it to get killed.
+ process = rph->GetHandle();
+ ASSERT_TRUE(process);
+
+ ui_test_utils::NavigateToURL(browser(), new_process_url);
+ // This should fail, because the navigation to the new URL would result in
+ // the process getting killed. This is an indirect way to check for the
+ // process having been terminated.
+ EXPECT_FALSE(base::KillProcess(process, 1, false));
+
+ // Now, let's load the unresponsive page in one tab, then open another tab
+ // which will use the same process.
+ ui_test_utils::NavigateToURL(browser(), infinite_beforeunload_url);
+ tab = browser()->GetWebContentsAt(0);
+ rph = tab->GetRenderProcessHost();
+ EXPECT_EQ(tab->GetURL(), infinite_beforeunload_url);
+
+ ui_test_utils::NavigateToURLWithDisposition(browser(), same_process_url,
+ NEW_BACKGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ EXPECT_EQ(browser()->tab_count(), 2);
+ tab2 = browser()->GetWebContentsAt(1);
+ ASSERT_TRUE(tab2 != NULL);
+ EXPECT_EQ(tab2->GetURL(), same_process_url);
+ EXPECT_EQ(rph, tab2->GetRenderProcessHost());
+
+ process = rph->GetHandle();
+ ASSERT_TRUE(process);
+
+ // Navigating to the cross site URL will not kill the process, since it will
+ // have more than one tab using it. Kill it to confirm that it is still there,
+ // as well as finish the test faster.
+ ui_test_utils::NavigateToURL(browser(), new_process_url);
+ EXPECT_TRUE(base::KillProcess(process, 1, false));
+}

Powered by Google App Engine
This is Rietveld 408576698