Roll Chrome into Mojo.

tools/valgrind/chrome_tests.py

Index: tools/valgrind/chrome_tests.py
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index 40ef7bab8f6afbd44281993844d0b2c482721b04..51ebeda72b33af3aeee878288b69a5443fda40d2 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -153,10 +153,12 @@ class ChromeTests:
       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):
@@ -762,13 +764,12 @@ def _main():
   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()