Revert of Disables RendererDebugURLsDontSwap on Mac in combination with ASAN (part 2)

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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 
@@ skipping 1601 matching lines @@
             shell()->web_contents()->GetSiteInstance());
 }
 
 // Ensure that renderer-side debug URLs do not cause a process swap, since they
 // are meant to run in the current page.  We had a bug where we expected a
 // BrowsingInstance swap to occur on pages like view-source and extensions,
 // which broke chrome://crash and javascript: URLs.
 // See http://crbug.com/335503.
 // The test fails on Mac OSX with ASAN.
 // See http://crbug.com/699062.
-#if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
+#if defined(OS_MACOSX) && defined(THREAD_SANITIZER)
 #define MAYBE_RendererDebugURLsDontSwap DISABLED_RendererDebugURLsDontSwap
 #else
 #define MAYBE_RendererDebugURLsDontSwap RendererDebugURLsDontSwap
 #endif
 IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        MAYBE_RendererDebugURLsDontSwap) {
   StartEmbeddedServer();
 
   GURL original_url(embedded_test_server()->GetURL("/title2.html"));
   GURL view_source_url(kViewSourceScheme + std::string(":") +
@@ skipping 1641 matching lines @@
   // than one ancestor has the same URL (excluding fragments), and the
   // navigating frame's current URL shouldn't count toward that.
   EXPECT_TRUE(
       ExecuteScript(child, "location.href = '" + first_url.spec() + "';"));
   observer2.Wait();
 
   EXPECT_EQ(child->current_url(), first_url);
 }
 
 }  // namespace content