Update TSan to r2386.
TEST=tried on bots a few times and fixed a couple of issues in TSan before creating this CL
Review URL: http://codereview.chromium.org/3177021

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/valgrind/scripts@56521 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
diff --git a/build-tsan-for-chromium.sh b/build-tsan-for-chromium.sh
index 3b808b2..6a4c8f6 100755
--- a/build-tsan-for-chromium.sh
+++ b/build-tsan-for-chromium.sh
@@ -8,7 +8,8 @@
 source common.sh
 if system_is_snow_leopard
 then
-  echo "ThreadSanitizer is not supported on Mac OS X 10.6 (Snow Leopard) yet."
+  echo "ThreadSanitizer is not supported on Mac OS X 10.6 yet." >&2
+  echo "See http://code.google.com/p/data-race-test/issues/detail?id=44" >&2
   exit 1
 fi
 
@@ -44,29 +45,16 @@
     "$OUT_BIN/valgrind-tsan.sh"
 }
 
-TSAN_REV=2200
+TSAN_REV=2386
 TSAN_DIR="$THISDIR/tsan" # Directory to checkout TSan sources
 rm -rf $TSAN_DIR
 svn co -r "$TSAN_REV" http://data-race-test.googlecode.com/svn/trunk $TSAN_DIR
 
-# The separate .sh file defines Valgrind/VEX revisions.
-source "tsan/third_party/valgrind_rev.sh"
-
-VG_TSAN_DIR="$THISDIR/valgrind-tsan" # Directory to checkout Valgrind sources
-checkout_and_patch_valgrind "$VALGRIND_REV" "$VEX_REV" "$VG_TSAN_DIR"
+VG_TSAN_DIR="$THISDIR/valgrind" # Directory to checkout Valgrind sources
+sh tsan/third_party/update_valgrind.sh # Fetch sources from valgrind-variant
 
 cd "$VG_TSAN_DIR"
 
-# Apply TSan-specific patches except
-# * limits
-# * guest_amd64_toIR
-# since they are already applied in common.sh.
-rm "$THISDIR"/tsan/valgrind_patches/{limits,guest_amd64_toIR}.patch
-for P in "$THISDIR"/tsan/valgrind_patches/*.patch
-do
-  patch -p0 -i $P
-done
-
 if [ `uname -s` == "Darwin" ]
 then
   if ls /opt/local/bin/ | grep "^gcc-mp-4\.4" >/dev/null