For unit tests, track additions to AtExitManager and warn.

content/test/test_launcher.cc

Index: content/test/test_launcher.cc
diff --git a/content/test/test_launcher.cc b/content/test/test_launcher.cc
index a59220b4c8390daacece440e279121ad82c4d019..b15fce5439abff6cd1d2c5dbe0432c3ceb6229b0 100644
--- a/content/test/test_launcher.cc
+++ b/content/test/test_launcher.cc
@@ -19,6 +19,7 @@
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/test/test_suite.h"
+#include "base/test/test_switches.h"
 #include "base/test/test_timeouts.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ -341,7 +342,7 @@ int RunTest(TestLauncherDelegate* launcher_delegate,
   // tests unless this flag was specified to the browser test executable.
   new_cmd_line.AppendSwitch("gtest_also_run_disabled_tests");
   new_cmd_line.AppendSwitchASCII("gtest_filter", test_name);
-  new_cmd_line.AppendSwitch(kSingleProcessTestsFlag);

[Paweł Hajdan Jr., 2012/06/22 07:52:42]

Also remove the declaration of kSingleProcessTestsFlag and
kSingleProcessTestsAndChromeFlag from content/public/test/test_luncher.h

[Scott Byer, 2012/06/22 22:02:55]

Done.

+  new_cmd_line.AppendSwitch(switches::kSingleProcessTestsFlag);
 
   // Do not let the child ignore failures.  We need to propagate the
   // failure status back to the parent.
@@ -565,8 +566,6 @@ const char kGTestRepeatFlag[] = "gtest_repeat";
 const char kGTestRunDisabledTestsFlag[] = "gtest_also_run_disabled_tests";
 const char kGTestOutputFlag[] = "gtest_output";
 
-const char kSingleProcessTestsFlag[]   = "single_process";
-const char kSingleProcessTestsAndChromeFlag[]   = "single-process";
 // The following is kept for historical reasons (so people that are used to
 // using it don't get surprised).
 const char kChildProcessFlag[]   = "child";
@@ -593,12 +592,12 @@ int LaunchTests(TestLauncherDelegate* launcher_delegate,
   // terrible UI.  Instead, there should be some sort of signal flag on the
   // command line, with all subsequent arguments passed through to the
   // underlying browser.
-  if (command_line->HasSwitch(kSingleProcessTestsFlag) ||
-      command_line->HasSwitch(kSingleProcessTestsAndChromeFlag) ||
+  if (command_line->HasSwitch(switches::kSingleProcessTestsFlag) ||
+      command_line->HasSwitch(switches::kSingleProcessTestsAndChromeFlag) ||
       command_line->HasSwitch(kGTestListTestsFlag) ||
       command_line->HasSwitch(kGTestHelpFlag)) {
 #if defined(OS_WIN)
-    if (command_line->HasSwitch(kSingleProcessTestsFlag)) {
+    if (command_line->HasSwitch(switches::kSingleProcessTestsFlag)) {
       sandbox::SandboxInterfaceInfo sandbox_info;
       content::InitializeSandboxInfo(&sandbox_info);
       content::InitializeSandbox(&sandbox_info);