Mark RenderFrameHostManagerTest.AllowTargetedNavigationsAfterSwap as flaky under TSANv2.

content/browser/frame_host/render_frame_host_manager_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
@@ skipping 319 matching lines @@
             shell()->web_contents()->GetLastCommittedURL().path());
 
   // Should have the same SiteInstance.
   scoped_refptr<SiteInstance> noref_site_instance(
       shell()->web_contents()->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, noref_site_instance);
 }
 
 // Test for crbug.com/116192.  Targeted links should still work after the
 // named target window has swapped processes.
+//
+// Flaky under TSANv2. http://crbug.com/400850
+#if defined(THREAD_SANITIZER)
+#define MAYBE_AllowTargetedNavigationsAfterSwap \
+    DISABLED_AllowTargetedNavigationsAfterSwap
+#else
+#define MAYBE_AllowTargetedNavigationsAfterSwap \
+    AllowTargetedNavigationsAfterSwap
+#endif
 IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
-                       AllowTargetedNavigationsAfterSwap) {
+                       MAYBE_AllowTargetedNavigationsAfterSwap) {
   StartServer();
 
   // Load a page with links that open in a new window.
   std::string replacement_path;
   ASSERT_TRUE(GetFilePathWithHostAndPortReplacement(
       "files/click-noreferrer-links.html",
       foo_host_port_,
       &replacement_path));
   NavigateToURL(shell(), test_server()->GetURL(replacement_path));
 
@@ skipping 39 matching lines @@
   navigation_observer.Wait();
 
   // Should have swapped back and shown the new window again.
   scoped_refptr<SiteInstance> revisit_site_instance(
       new_shell->web_contents()->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, revisit_site_instance);
 
   // If it navigates away to another process, the original window should
   // still be able to close it (using a cross-process close message).
   NavigateToURL(new_shell, cross_site_url);
   EXPECT_EQ(new_site_instance,

[Charlie Reis, 2014/08/05 21:49:52]

Actually, this is not an important part of the test.  We only care that it's not
in orig_site_instance, not that it's in new_site_instance.  Can we just replace
it with this?

EXPECT_NE(orig_site_instance, new_shell->web_contents()->GetSiteInstance());

If that works, we don't need to disable the test.

             new_shell->web_contents()->GetSiteInstance());
   WebContentsDestroyedWatcher close_watcher(new_shell->web_contents());
   EXPECT_TRUE(ExecuteScriptAndExtractBool(
       shell()->web_contents(),
       "window.domAutomationController.send(testCloseWindow());",
       &success));
   EXPECT_TRUE(success);
   close_watcher.Wait();
 }
 
@@ skipping 1045 matching lines @@
   // Navigate to url1 and check bindings.
   NavigateToURL(new_shell, url1);
   // The navigation should have used the first SiteInstance, otherwise
   // |initial_rvh| did not have a chance to be used.
   EXPECT_EQ(new_web_contents->GetSiteInstance(), site_instance1);
   EXPECT_EQ(BINDINGS_POLICY_WEB_UI,
       new_web_contents->GetRenderViewHost()->GetEnabledBindings());
 }
 
 }  // namespace content