Add a MANUAL_ prefix for browser tests. These tests don't run unless --run-manual is specified.

content/test/test_launcher.cc

Index: content/test/test_launcher.cc
===================================================================
--- content/test/test_launcher.cc	(revision 150808)
+++ content/test/test_launcher.cc	(working copy)
@@ -41,6 +41,26 @@
 namespace test_launcher {
 
 namespace {
+
+// A multiplier for slow tests. We generally avoid multiplying
+// test timeouts by any constants. Here it is used as last resort
+// to implement the SLOW_ test prefix.
+static const int kSlowTestTimeoutMultiplier = 5;

[darin (slow to review), 2012/08/11 06:16:59]

nit: 'static' is redundant w/ anonymous namespace

[jam, 2012/08/13 00:45:25]

Done.

+
+// Tests with this prefix have a longer timeout, see above.
+const char kSlowTestPrefix[] = "SLOW_";
+
+// Tests with this prefix run before the same test without it, and use the same
+// profile. i.e. Foo.PRE_Test runs and then Foo.Test. This allows writing tests
+// that span browser restarts.
+const char kPreTestPrefix[] = "PRE_";
+
+// Manual tests only run when --run-manual is specified. This allows writing
+// tests that don't run automatically but are still in the same test binary.
+// This is useful so that a team that wants to run a few tests doesn't have to
+// add a new binary that must be compiled on all builds.
+const char kManualTestPrefix[] = "MANUAL_";
+
 TestLauncherDelegate* g_launcher_delegate;
 }
 
@@ -281,11 +301,6 @@
   }
 }
 
-// A multiplier for slow tests. We generally avoid multiplying
-// test timeouts by any constants. Here it is used as last resort
-// to implement the SLOW_ test prefix.
-static const int kSlowTestTimeoutMultiplier = 5;
-
 base::TimeDelta GetTestTerminationTimeout(const std::string& test_name,
                                           base::TimeDelta default_timeout) {
   base::TimeDelta timeout = default_timeout;
@@ -293,7 +308,7 @@
   // Make it possible for selected tests to request a longer timeout.
   // Generally tests should really avoid doing too much, and splitting
   // a test instead of using SLOW prefix is strongly preferred.
-  if (test_name.find("SLOW_") != std::string::npos)
+  if (test_name.find(kSlowTestPrefix) != std::string::npos)
     timeout *= kSlowTestTimeoutMultiplier;
 
   return timeout;
@@ -306,7 +321,8 @@
                     bool* was_timeout) {
   if (test_case) {
     std::string pre_test_name = test_name;
-    ReplaceFirstSubstringAfterOffset(&pre_test_name, 0, ".", ".PRE_");
+    std::string replace_string = std::string(".") + kPreTestPrefix;
+    ReplaceFirstSubstringAfterOffset(&pre_test_name, 0, ".", replace_string);
     for (int i = 0; i < test_case->total_test_count(); ++i) {
       const testing::TestInfo* test_info = test_case->GetTestInfo(i);
       std::string cur_test_name = test_info->test_case_name();
@@ -483,9 +499,14 @@
         continue;
       }
 
-      if (StartsWithASCII(test_info->name(), "PRE_", true))
+      if (StartsWithASCII(test_info->name(), kPreTestPrefix, true))
         continue;
 
+      if (StartsWithASCII(test_info->name(), kManualTestPrefix, true) &&
+          !command_line->HasSwitch(kRunManualTestsFlag)) {
+        continue;
+      }
+
       // Skip the test that doesn't match the filter string (if given).
       if ((!positive_filter.empty() &&
            !MatchesFilter(test_name, positive_filter)) ||
@@ -595,6 +616,10 @@
 
 const char kSingleProcessTestsFlag[]   = "single_process";
 const char kSingleProcessTestsAndChromeFlag[]   = "single-process";
+
+// See kManualTestPrefix above.
+const char kRunManualTestsFlag[] = "run-manual";
+
 // The following is kept for historical reasons (so people that are used to
 // using it don't get surprised).
 const char kChildProcessFlag[]   = "child";