Update Valgrind's run_chrome_tests.py to pass sharding flags.

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 135 matching lines @@
       cmd.append("--gtest_print_time")
       # Built-in test launcher for gtest-based executables runs tests using
       # multiple process by default. Force the single-process mode back.
       cmd.append("--single-process-tests")
     if self._options.gtest_repeat:
       cmd.append("--gtest_repeat=%s" % self._options.gtest_repeat)
     if self._options.gtest_shuffle:
       cmd.append("--gtest_shuffle")
     if self._options.gtest_break_on_failure:
       cmd.append("--gtest_break_on_failure")
-    if self._options.brave_new_test_launcher:
-      cmd.append("--brave-new-test-launcher")
     if self._options.test_launcher_bot_mode:
       cmd.append("--test-launcher-bot-mode")
+    if self._options.test_launcher_total_shards is not None:
+      cmd.append("--test-launcher-total-shards=%d" % self._options.test_launcher_total_shards)
+    if self._options.test_launcher_shard_index is not None:
+      cmd.append("--test-launcher-shard-index=%d" % self._options.test_launcher_shard_index)
     return cmd
 
   def Run(self):
     ''' Runs the test specified by command-line argument --test '''
     logging.info("running test %s" % (self._test))
     return self._test_list[self._test](self)
 
   def _AppendGtestFilter(self, tool, name, cmd):
     '''Append an appropriate --gtest_filter flag to the googletest binary
        invocation.
@@ skipping 585 matching lines @@
   parser.add_option("--tool_flags", dest="valgrind_tool_flags", default="",
                     help="specify custom flags for the selected valgrind tool")
   parser.add_option("--keep_logs", action="store_true", default=False,
                     help="store memory tool logs in the <tool>.logs directory "
                          "instead of /tmp.\nThis can be useful for tool "
                          "developers/maintainers.\nPlease note that the <tool>"
                          ".logs directory will be clobbered on tool startup.")
   parser.add_option("-n", "--num_tests", type="int",
                     default=ChromeTests.LAYOUT_TESTS_DEFAULT_CHUNK_SIZE,
                     help="for layout tests: # of subtests per run.  0 for all.")
-  # TODO(thestig) Remove this if we can.
-  parser.add_option("--gtest_color", dest="gtest_color", default="no",
-                    help="dummy compatibility flag for sharding_supervisor.")
-  parser.add_option("--brave-new-test-launcher", action="store_true",
-                    help="run the tests with --brave-new-test-launcher")
   parser.add_option("--test-launcher-bot-mode", action="store_true",
                     help="run the tests with --test-launcher-bot-mode")
+  parser.add_option("--test-launcher-total-shards", type=int,
+                    help="run the tests with --test-launcher-total-shards")
+  parser.add_option("--test-launcher-shard-index", type=int,
+                    help="run the tests with --test-launcher-shard-index")
 
   options, args = parser.parse_args()
 
   # Bake target into build_dir.
   if options.target and options.build_dir:
     assert (options.target !=
             os.path.basename(os.path.dirname(options.build_dir)))
     options.build_dir = os.path.join(os.path.abspath(options.build_dir),
                                      options.target)
 
@@ skipping 14 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())