Land http://codereview.chromium.org/2998005/show -- Update Memcheck command...

scripts/master/factory/nacl_factory.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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.
 
 """Utility class to generate a Native-Client-specific BuildFactory.
 
 Based on gclient_factory.py."""
 
 import os
@@ skipping 173 matching lines @@
 
     for test_size in ['small', 'medium', 'large', 'smoke']:
       if R('nacl_%s_tests' % test_size):
         if test_size == 'large':
           timeout = 600
         else:
           timeout = 300
         f.AddSizedTests(test_size, options=options, timeout=timeout)
 
     if R('nacl_valgrind'):
-      f.AddValgrind(options=options)
+      f.AddMemcheck(options=options)
+      f.AddThreadSanitizer(options=options)
 
     if R('nacl_arm_hw'):
       for test_size in ['small']:
         f.AddSizedTests(test_size,
                         full_name='%s_tests_arm_hw_only' % test_size,
                         options=options)
 
     if R('nacl_utman_arm_tests'):
       f.AddUtmanTests('arm', options=options)
     if R('nacl_utman_x86_32_tests'):
@@ skipping 98 matching lines @@
                                                       target,
                                                       self._build_dir,
                                                       self._target_platform,
                                                       test_target=test_target)
 
     nacl_cmd_obj.AddModularBuildStep(
         mode=mode, clobber=clobber, options=options,
         timeout=compile_timeout)
 
     return factory