Revert 144488 - For unit tests, track additions to AtExitManager and warn.

content/test/test_launcher.cc

Index: content/test/test_launcher.cc
===================================================================
--- content/test/test_launcher.cc	(revision 148403)
+++ content/test/test_launcher.cc	(working copy)
@@ -19,7 +19,6 @@
 #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"
@@ -338,7 +337,7 @@
   // 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(switches::kSingleProcessTestsFlag);
+  new_cmd_line.AppendSwitch(kSingleProcessTestsFlag);
 
   // Do not let the child ignore failures.  We need to propagate the
   // failure status back to the parent.
@@ -561,6 +560,8 @@
 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";
@@ -590,12 +591,12 @@
   // 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(switches::kSingleProcessTestsFlag) ||
-      command_line->HasSwitch(switches::kSingleProcessChromeFlag) ||
+  if (command_line->HasSwitch(kSingleProcessTestsFlag) ||
+      command_line->HasSwitch(kSingleProcessTestsAndChromeFlag) ||
       command_line->HasSwitch(kGTestListTestsFlag) ||
       command_line->HasSwitch(kGTestHelpFlag)) {
 #if defined(OS_WIN)
-    if (command_line->HasSwitch(switches::kSingleProcessTestsFlag)) {
+    if (command_line->HasSwitch(kSingleProcessTestsFlag)) {
       sandbox::SandboxInterfaceInfo sandbox_info;
       content::InitializeSandboxInfo(&sandbox_info);
       content::InitializeSandbox(&sandbox_info);