Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / browser / frame_host / render_frame_host_manager_browsertest.cc

diff --git a/src/content/browser/frame_host/render_frame_host_manager_browsertest.cc b/src/content/browser/frame_host/render_frame_host_manager_browsertest.cc
index ad2689e..b8cb2ab 100644 (file)
--- a/src/content/browser/frame_host/render_frame_host_manager_browsertest.cc
+++ b/src/content/browser/frame_host/render_frame_host_manager_browsertest.cc
@@ -411,9 +411,10 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
 
 // Test that setting the opener to null in a window affects cross-process
 // navigations, including those to existing entries.  http://crbug.com/156669.
+// Flaky on android: http://crbug.com/397185
 // Flaky on windows: http://crbug.com/291249
 // This test also crashes under ThreadSanitizer, http://crbug.com/356758.
-#if defined(OS_WIN) || defined(THREAD_SANITIZER)
+#if defined(OS_ANDROID) || defined(OS_WIN) || defined(THREAD_SANITIZER)
 #define MAYBE_DisownOpener DISABLED_DisownOpener
 #else
 #define MAYBE_DisownOpener DisownOpener