diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 19:47:18 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 19:47:18 +0000 |
| commit | dee6c492fa9cfd2f8281be7459df291524447d52 (patch) | |
| tree | 5f107e55528cdb922f325cfb7f0bbc830a88bef4 /content/test | |
| parent | 2bf077848c2d9043c11243afca2919f0881d2a14 (diff) | |
| download | chromium_src-dee6c492fa9cfd2f8281be7459df291524447d52.zip chromium_src-dee6c492fa9cfd2f8281be7459df291524447d52.tar.gz chromium_src-dee6c492fa9cfd2f8281be7459df291524447d52.tar.bz2 | |
Revert 132018 - Fixing a problem, where a hung renderer process is not killed when navigating away
(Test failure of RenderViewHostTest.UnresponsiveCrossSiteNavigation)
BUG=104346
TEST=Steps to reproduce listed in the bug.
Review URL: http://codereview.chromium.org/10008015
TBR=nasko@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10065021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132034 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
| -rw-r--r-- | content/test/data/english_page.html | 7 | ||||
| -rw-r--r-- | content/test/data/infinite_beforeunload.html | 17 | ||||
| -rw-r--r-- | content/test/data/infinite_unload.html | 17 | ||||
| -rw-r--r-- | content/test/mock_render_process_host.cc | 2 | ||||
| -rw-r--r-- | content/test/mock_render_process_host.h | 2 |
5 files changed, 2 insertions, 43 deletions
diff --git a/content/test/data/english_page.html b/content/test/data/english_page.html deleted file mode 100644 index 30b0d42..0000000 --- a/content/test/data/english_page.html +++ /dev/null @@ -1,7 +0,0 @@ -<html> -<head><title>This page is in English</title></head> -<body> -No joke! This is a page written in English. Awesome don't you think? -It has to be more than 100 bytes long for the CLD to detect the language correctly. -</body> -</html> diff --git a/content/test/data/infinite_beforeunload.html b/content/test/data/infinite_beforeunload.html deleted file mode 100644 index 5a3e017..0000000 --- a/content/test/data/infinite_beforeunload.html +++ /dev/null @@ -1,17 +0,0 @@ -<html> -<head> - <title>Infinite beforeunload</title> -</head> - -<body> -<script> - window.onbeforeunload = function(e) { - while(true){} - } -</script> - -Infinite beforeunload handler. - -</body> - -</html> diff --git a/content/test/data/infinite_unload.html b/content/test/data/infinite_unload.html deleted file mode 100644 index 742df08..0000000 --- a/content/test/data/infinite_unload.html +++ /dev/null @@ -1,17 +0,0 @@ -<html> -<head> - <title>Infinite unload</title> -</head> - -<body> -<script> - window.onunload = function(e) { - while(true){} - } -</script> - -Infinite unload handler. - -</body> - -</html> diff --git a/content/test/mock_render_process_host.cc b/content/test/mock_render_process_host.cc index a1268af..90ba216 100644 --- a/content/test/mock_render_process_host.cc +++ b/content/test/mock_render_process_host.cc @@ -54,7 +54,7 @@ int MockRenderProcessHost::GetNextRoutingID() { void MockRenderProcessHost::CancelResourceRequests(int render_widget_id) { } -void MockRenderProcessHost::SimulateSwapOutACK( +void MockRenderProcessHost::CrossSiteSwapOutACK( const ViewMsg_SwapOut_Params& params) { } diff --git a/content/test/mock_render_process_host.h b/content/test/mock_render_process_host.h index 1110285..4726f66 100644 --- a/content/test/mock_render_process_host.h +++ b/content/test/mock_render_process_host.h @@ -37,7 +37,7 @@ class MockRenderProcessHost : public RenderProcessHost { virtual bool Init(bool is_accessibility_enabled) OVERRIDE; virtual int GetNextRoutingID() OVERRIDE; virtual void CancelResourceRequests(int render_widget_id) OVERRIDE; - virtual void SimulateSwapOutACK( + virtual void CrossSiteSwapOutACK( const ViewMsg_SwapOut_Params& params) OVERRIDE; virtual bool WaitForUpdateMsg(int render_widget_id, const base::TimeDelta& max_delay, |