[Sync] Merge sync_unit_tests into components_unit_tests.

tools/valgrind/chrome_tests.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 ''' Runs various chrome tests through valgrind_test.py.'''
 
 import glob
 import logging
 import multiprocessing
@@ skipping 435 matching lines @@
                            cmd_args=[
                                "--ui-test-action-timeout=60000",
                                "--ui-test-action-max-timeout=150000"])
 
   def TestSkia(self):
     return self.SimpleTest("skia", "skia_unittests")
 
   def TestSql(self):
     return self.SimpleTest("chrome", "sql_unittests")
 
-  def TestSync(self):
-    return self.SimpleTest("chrome", "sync_unit_tests")
-
   def TestLinuxSandbox(self):
     return self.SimpleTest("sandbox", "sandbox_linux_unittests")
 
   def TestUnit(self):
     # http://crbug.com/51716
     # Disabling all unit tests
     # Problems reappeared after r119922
     if common.IsMac() and (self._options.valgrind_tool == "memcheck"):
       logging.warning("unit_tests are disabled for memcheck on MacOS.")
       return 0;
@@ skipping 233 matching lines @@
     "net": TestNet,              "net_unittests": TestNet,
     "net_perf": TestNetPerf,     "net_perftests": TestNetPerf,
     "phonenumber": TestPhoneNumber,
     "libphonenumber_unittests": TestPhoneNumber,
     "ppapi": TestPPAPI,          "ppapi_unittests": TestPPAPI,
     "printing": TestPrinting,    "printing_unittests": TestPrinting,
     "remoting": TestRemoting,    "remoting_unittests": TestRemoting,
     "sandbox": TestLinuxSandbox, "sandbox_linux_unittests": TestLinuxSandbox,
     "skia": TestSkia,            "skia_unittests": TestSkia,
     "sql": TestSql,              "sql_unittests": TestSql,
-    "sync": TestSync,            "sync_unit_tests": TestSync,
     "sync_integration_tests": TestSyncIntegration,
     "sync_integration": TestSyncIntegration,
     "ui_base_unit": TestUIBaseUnit,       "ui_base_unittests": TestUIBaseUnit,
     "ui_chromeos": TestUIChromeOS, "ui_chromeos_unittests": TestUIChromeOS,
     "unit": TestUnit,            "unit_tests": TestUnit,
     "url": TestURL,              "url_unittests": TestURL,
     "views": TestViews,          "views_unittests": TestViews,
     "webkit": TestLayout,
   }
 
@@ skipping 72 matching lines @@
 
   for t in options.test:
     tests = ChromeTests(options, args, t)
     ret = tests.Run()
     if ret: return ret
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(_main())