diff options
| author | jaekyun <jaekyun@chromium.org> | 2014-12-04 15:33:35 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-04 23:34:12 +0000 |
| commit | 37e572a3b60109e457a09df566d15c6f96b79210 (patch) | |
| tree | 55d1f092f2ee9e5578f17e05213ec30554f16578 /content/browser/security_exploit_browsertest.cc | |
| parent | 59246ff8886fe98b28405a8e358982a6dc0a585e (diff) | |
| download | chromium_src-37e572a3b60109e457a09df566d15c6f96b79210.zip chromium_src-37e572a3b60109e457a09df566d15c6f96b79210.tar.gz chromium_src-37e572a3b60109e457a09df566d15c6f96b79210.tar.bz2 | |
Use StopChildProcess instead of base::KillProcess to kill a renderer process
base::KillProcess doesn't work on android because a renderer process is running as an isolated process.
So we need to use StopChildProcess to kill it.
BUG=433068
Review URL: https://codereview.chromium.org/740813004
Cr-Commit-Position: refs/heads/master@{#306931}
Diffstat (limited to 'content/browser/security_exploit_browsertest.cc')
| -rw-r--r-- | content/browser/security_exploit_browsertest.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc index 68430ad..be65a56 100644 --- a/content/browser/security_exploit_browsertest.cc +++ b/content/browser/security_exploit_browsertest.cc @@ -110,17 +110,9 @@ class SecurityExploitBrowserTest : public ContentBrowserTest { } }; -// Fails because the process kill on Android does not succeed. -// http://crbug.com/433068 -#if defined(OS_ANDROID) -#define MAYBE_SetWebUIProperty DISABLED_SetWebUIProperty -#else -#define MAYBE_SetWebUIProperty SetWebUIProperty -#endif - // Ensure that we kill the renderer process if we try to give it WebUI // properties and it doesn't have enabled WebUI bindings. -IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest, MAYBE_SetWebUIProperty) { +IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest, SetWebUIProperty) { GURL foo("http://foo.com/simple_page.html"); NavigateToURL(shell(), foo); |