Disable the two blink_heap_unittests that fail under tsan and run suite on tsan bot.

Disables HeapTest.CrossThreadWeakPersistent and HeapTest.ThreadedStrongification
under TSan.

Bug: 843511,915200,831674,913704
Change-Id: I6ab71b83fa937f739a57452a97bd43ef6375bf2c
Reviewed-on: https://chromium-review.googlesource.com/c/1377517
Reviewed-by: Hans Wennborg <hans@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#616652}
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index b79d871..d824094 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -8152,6 +8152,15 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "blink_heap_unittests"
+      },
+      {
+        "args": [
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "blink_platform_unittests"
       },
       {
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index eda069c..cb0cab67 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -56,12 +56,6 @@
       },
     },
   },
-  'blink_heap_unittests': {
-    'remove_from': [
-      # chromium.memory
-      'Linux TSan Tests',  # https://crbug.com/831674
-    ],
-  },
   'browser_tests': {
     'remove_from': [
       # chromium.clang
diff --git a/third_party/blink/renderer/platform/heap/heap_test.cc b/third_party/blink/renderer/platform/heap/heap_test.cc
index b198b09..2120b6a 100644
--- a/third_party/blink/renderer/platform/heap/heap_test.cc
+++ b/third_party/blink/renderer/platform/heap/heap_test.cc
@@ -5499,7 +5499,14 @@
   static volatile uintptr_t worker_object_pointer_;
 };
 
-TEST(HeapTest, ThreadedStrongification) {
+#if defined(THREAD_SANITIZER)
+// https://crbug.com/915200
+#define MAYBE_ThreadedStrongification DISABLED_ThreadedStrongification
+#else
+#define MAYBE_ThreadedStrongification ThreadedStrongification
+#endif
+
+TEST(HeapTest, MAYBE_ThreadedStrongification) {
   ThreadedStrongificationTester::Test();
 }
 
@@ -6385,7 +6392,14 @@
 
 }  // anonymous namespace
 
-TEST(HeapTest, CrossThreadWeakPersistent) {
+#if defined(THREAD_SANITIZER)
+// https://crbug.com/915200
+#define MAYBE_CrossThreadWeakPersistent DISABLED_CrossThreadWeakPersistent
+#else
+#define MAYBE_CrossThreadWeakPersistent CrossThreadWeakPersistent
+#endif
+
+TEST(HeapTest, MAYBE_CrossThreadWeakPersistent) {
   // Create an object in the worker thread, have a CrossThreadWeakPersistent
   // pointing to it on the main thread, clear the reference in the worker
   // thread, run a GC in the worker thread, and see if the