summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorzhaoqin <zhaoqin@chromium.org>2015-11-11 20:28:46 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-12 04:29:36 +0000
commit0628127931bf577cf3b8f33602214e5cfa24050a (patch)
treeaa86dc1bc6791e3de162a977955792d324287c34 /content
parent9bae4168a0f36ada19d9f1557e6ba4da1a4f3991 (diff)
downloadchromium_src-0628127931bf577cf3b8f33602214e5cfa24050a.zip
chromium_src-0628127931bf577cf3b8f33602214e5cfa24050a.tar.gz
chromium_src-0628127931bf577cf3b8f33602214e5cfa24050a.tar.bz2
Disable SitePerProcessBrowserTest.RenderViewHostPendingDeletionIsNotReused on TSan bot
TBR=alexmos@chromium.org, jam@chromium.org BUG=554825 Review URL: https://codereview.chromium.org/1440953002 Cr-Commit-Position: refs/heads/master@{#359262}
Diffstat (limited to 'content')
-rw-r--r--content/browser/site_per_process_browsertest.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index b295f43..bb9f32a 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -3649,8 +3649,16 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
// delay the SwapOut ACK from the A->B navigation, so that the second B->A
// navigation is initiated before the first page receives the SwapOut ACK.
// Ensure that the RVH(A) that's pending deletion is not reused in that case.
+// crbug.com/554825
+#if defined(THREAD_SANITIZER)
+#define MAYBE_RenderViewHostPendingDeletionIsNotReused \
+ DISABLED_RenderViewHostPendingDeletionIsNotReused
+#else
+#define MAYBE_RenderViewHostPendingDeletionIsNotReused \
+ RenderViewHostPendingDeletionIsNotReused
+#endif
IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
- RenderViewHostPendingDeletionIsNotReused) {
+ MAYBE_RenderViewHostPendingDeletionIsNotReused) {
GURL a_url(embedded_test_server()->GetURL("a.com", "/title1.html"));
NavigateToURL(shell(), a_url);