Don't skip retries when force-running broken tests.

base/test/test_switches.cc

 // 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.
 
 #include "base/test/test_switches.h"
 
 // Maximum number of tests to run in a single batch.
 const char switches::kTestLauncherBatchLimit[] = "test-launcher-batch-limit";
 
 // Sets defaults desirable for the continuous integration bots, e.g. parallel
 // test execution and test retries.
 const char switches::kTestLauncherBotMode[] =
     "test-launcher-bot-mode";
 
 // Makes it possible to debug the launcher itself. By default the launcher
 // automatically switches to single process mode when it detects presence
 // of debugger.
 const char switches::kTestLauncherDebugLauncher[] =
     "test-launcher-debug-launcher";
 
-// Force running all requested tests even when too many errors occur.
+// Force running all requested tests and retries even if too many test errors
+// occur.
 const char switches::kTestLauncherForceRunBrokenTests[] =
     "test-launcher-force-run-broken-tests";
 
 // Path to file containing test filter (one pattern per line).
 const char switches::kTestLauncherFilterFile[] = "test-launcher-filter-file";
 
 // Number of parallel test launcher jobs.
 const char switches::kTestLauncherJobs[] = "test-launcher-jobs";
 
 // Path to list of compiled in tests.
@@ skipping 26 matching lines @@
 // Total number of shards. Must be the same for all shards.
 const char switches::kTestLauncherTotalShards[] =
     "test-launcher-total-shards";
 
 // Time (in milliseconds) that the tests should wait before timing out.
 const char switches::kTestLauncherTimeout[] = "test-launcher-timeout";
 // TODO(phajdan.jr): Clean up the switch names.
 const char switches::kTestTinyTimeout[] = "test-tiny-timeout";
 const char switches::kUiTestActionTimeout[] = "ui-test-action-timeout";
 const char switches::kUiTestActionMaxTimeout[] = "ui-test-action-max-timeout";