| Index: content/browser/security_exploit_browsertest.cc
|
| diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc
|
| index bedf5b884ca53b1cb0dda0f6a2e7b6695d11ed40..5eb0339758ce3fe6397c377ca35c7a9bc7506e83 100644
|
| --- a/content/browser/security_exploit_browsertest.cc
|
| +++ b/content/browser/security_exploit_browsertest.cc
|
| @@ -253,13 +253,21 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest, SetWebUIProperty) {
|
| terminated.Wait();
|
| }
|
|
|
| +#if defined(OS_ANDROID)
|
| +// Flaky on android: https://crbug.com/703657
|
| +#define MAYBE_AttemptDuplicateRenderViewHost \
|
| + DISABLED_AttemptDuplicateRenderViewHost
|
| +#else
|
| +#define MAYBE_AttemptDuplicateRenderViewHost AttemptDuplicateRenderViewHost
|
| +#endif
|
| +
|
| // This is a test for crbug.com/312016 attempting to create duplicate
|
| // RenderViewHosts. SetupForDuplicateHosts sets up this test case and leaves
|
| // it in a state with pending RenderViewHost. Before the commit of the new
|
| // pending RenderViewHost, this test case creates a new window through the new
|
| // process.
|
| IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
|
| - AttemptDuplicateRenderViewHost) {
|
| + MAYBE_AttemptDuplicateRenderViewHost) {
|
| int32_t duplicate_routing_id = MSG_ROUTING_NONE;
|
| RenderViewHostImpl* pending_rvh =
|
| PrepareToDuplicateHosts(shell(), &duplicate_routing_id);
|
| @@ -289,11 +297,19 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
|
| // If the above operation doesn't cause a crash, the test has succeeded!
|
| }
|
|
|
| +#if defined(OS_ANDROID)
|
| +// Flaky on android: https://crbug.com/703657
|
| +#define MAYBE_AttemptDuplicateRenderWidgetHost \
|
| + DISABLED_AttemptDuplicateRenderWidgetHost
|
| +#else
|
| +#define MAYBE_AttemptDuplicateRenderWidgetHost AttemptDuplicateRenderWidgetHost
|
| +#endif
|
| +
|
| // This is a test for crbug.com/312016. It tries to create two RenderWidgetHosts
|
| // with the same process and routing ids, which causes a collision. It is almost
|
| // identical to the AttemptDuplicateRenderViewHost test case.
|
| IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
|
| - AttemptDuplicateRenderWidgetHost) {
|
| + MAYBE_AttemptDuplicateRenderWidgetHost) {
|
| #if defined(OS_WIN)
|
| // PlzNavigate
|
| // This test is failing in a flaky manner on Android as it appears to be
|
|
|