Index: content/browser/browser_plugin/browser_plugin_host_browsertest.cc |
diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc |
index 1ddd0a80f79a00212fb6f148f7492c526507e71c..e2a7a7c27a82b2d00238b7804a4fd1756983f1a4 100644 |
--- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc |
+++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc |
@@ -425,7 +425,13 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, MAYBE_AcceptDragEvents) { |
// This test verifies that if a browser plugin is hidden before navigation, |
// the guest starts off hidden. |
-IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, HiddenBeforeNavigation) { |
+// This test is flaky under ThreadSanitizer, see http://crbug.com/370240 |
+#if !defined(THREAD_SANITIZER) |
+#define MAYBE_HiddenBeforeNavigation HiddenBeforeNavigation |
+#else |
+#define MAYBE_HiddenBeforeNavigation DISABLED_HiddenBeforeNavigation |
+#endif |
+IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, MAYBE_HiddenBeforeNavigation) { |
const char* kEmbedderURL = "/browser_plugin_embedder.html"; |
const std::string embedder_code = |
"document.getElementById('plugin').style.visibility = 'hidden'"; |