Re-enable BackgroundTracingManagerBrowserTest.CallTriggersMoreThanOnceOnlyGatherOnce under TSan.

content/browser/tracing/background_tracing_manager_browsertest.cc

 // Copyright 2015 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 <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 166 matching lines @@
 
     BackgroundTracingManager::GetInstance()->TriggerNamedEvent(
         handle, base::Bind(&StartedFinalizingCallback, base::Closure(), true));
 
     run_loop.Run();
 
     EXPECT_TRUE(upload_config_wrapper.get_receive_count() == 1);
   }
 }
 
-#if defined(THREAD_SANITIZER)
-// There's a race in ConvertableToTraceFormat that's hard to suppress,
-// see http://crbug.com/559117.
-#define MAYBE_CallTriggersMoreThanOnceOnlyGatherOnce \
-    DISABLED_CallTriggersMoreThanOnceOnlyGatherOnce
-#else
-#define MAYBE_CallTriggersMoreThanOnceOnlyGatherOnce \
-    CallTriggersMoreThanOnceOnlyGatherOnce
-#endif
 // This tests triggering more than once still only gathers once.
 IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
-                       MAYBE_CallTriggersMoreThanOnceOnlyGatherOnce) {
+                       CallTriggersMoreThanOnceOnlyGatherOnce) {
   {
     SetupBackgroundTracingManager();
 
     base::RunLoop run_loop;
     BackgroundTracingManagerUploadConfigWrapper upload_config_wrapper(
         run_loop.QuitClosure());
 
     scoped_ptr<BackgroundTracingConfig> config = CreatePreemptiveConfig();
 
     content::BackgroundTracingManager::TriggerHandle handle =
@@ skipping 908 matching lines @@
     BackgroundTracingManager::GetInstance()->TriggerNamedEvent(
         handle, base::Bind(&StartedFinalizingCallback, base::Closure(), false));
 
     run_loop.Run();
 
     EXPECT_TRUE(upload_config_wrapper.get_receive_count() == 1);
   }
 }
 
 }  // namespace content