Revert 55400 - Cleanup in base. This moves the implementation (and a bunch of header file

dependencies) from the multiprocess test and the test_suite headers to .cc
files. Moves multiprocess_test to the test directory, and all of this stuff to
the existing base_test_support project. I also used the base namespace.

Previously other projects included this functionality just by #include because
it was all inline, so I had to add dependencies on base_test_support in a few
places.

Moves and renames the command line switch this was using to base_switches. Move
the base switch for process type to chrome switches.

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/3026055

TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/3035062

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55416 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 8 insertions, 12 deletions

diff --git a/chrome/test/mini_installer_test/run_all_unittests.cc b/chrome/test/mini_installer_test/run_all_unittests.cc
index a0f6159..0549e1a 100644
--- a/chrome/test/mini_installer_test/run_all_unittests.cc
+++ b/chrome/test/mini_installer_test/run_all_unittests.cc
@@ -4,7 +4,6 @@
 
 #include "base/command_line.h"
 #include "base/file_util.h"
-#include "base/process_util.h"
 #include "base/test/test_suite.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/util_constants.h"
@@ -45,7 +44,7 @@ int main(int argc, char** argv) {
   // with cleaning the system or make a backup before continuing.
   CommandLine::Init(argc, argv);
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  base::TestSuite test_suite(argc, argv);
+  TestSuite test_suite = TestSuite(argc, argv);
   if (command_line.HasSwitch(switches::kInstallerTestClean)) {
     printf("Current version of Chrome will be uninstalled "
            "from all levels before proceeding with tests.\n");
diff --git a/chrome/test/perf/perftests.cc b/chrome/test/perf/perftests.cc
index dd00b65..904d44e 100644
--- a/chrome/test/perf/perftests.cc
+++ b/chrome/test/perf/perftests.cc
@@ -7,7 +7,7 @@
 #include "chrome/common/chrome_paths.cc"
 
 int main(int argc, char **argv) {
-  base::PerfTestSuite suite(argc, argv);
+  PerfTestSuite suite(argc, argv);
   chrome::RegisterPathProvider();
   MessageLoop main_message_loop;
 
diff --git a/chrome/test/test_launcher/out_of_proc_test_runner.cc b/chrome/test/test_launcher/out_of_proc_test_runner.cc
index 290bec0..eb4e172 100644
--- a/chrome/test/test_launcher/out_of_proc_test_runner.cc
+++ b/chrome/test/test_launcher/out_of_proc_test_runner.cc
@@ -78,7 +78,7 @@ class OutOfProcTestRunner : public tests::TestRunner {
 
     // Do not let the child ignore failures.  We need to propagate the
     // failure status back to the parent.
-    new_cmd_line.AppendSwitch(base::TestSuite::kStrictFailureHandling);
+    new_cmd_line.AppendSwitch(kStrictFailureHandling);
 
     base::ProcessHandle process_handle;
     if (!base::LaunchApp(new_cmd_line, false, false, &process_handle))
diff --git a/chrome/test/test_launcher/test_runner.cc b/chrome/test/test_launcher/test_runner.cc
index de448a36..1b75318 100644
--- a/chrome/test/test_launcher/test_runner.cc
+++ b/chrome/test/test_launcher/test_runner.cc
@@ -237,7 +237,7 @@ bool RunTests(const TestRunnerFactory& test_runner_factory) {
       ++test_run_count;
       if (!test_runner->RunTest(test_name.c_str())) {
         failed_tests.push_back(test_name);
-        bool ignore_failure = base::TestSuite::ShouldIgnoreFailure(*test_info);
+        bool ignore_failure = TestSuite::ShouldIgnoreFailure(*test_info);
         printer.OnTestEnd(test_info->name(), test_case->name(), true, true,
                           ignore_failure,
                           (base::Time::Now() - start_time).InMillisecondsF());
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h
index 1cdd90f..b788879 100644
--- a/chrome/test/unit/chrome_test_suite.h
+++ b/chrome/test/unit/chrome_test_suite.h
@@ -12,11 +12,9 @@
 
 #include "app/app_paths.h"
 #include "app/resource_bundle.h"
-#include "base/command_line.h"
 #include "base/stats_table.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "base/process_util.h"
 #include "base/ref_counted.h"
 #include "base/scoped_nsautorelease_pool.h"
 #include "base/test/test_suite.h"
@@ -30,7 +28,6 @@
 #include "chrome/test/testing_browser_process.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac_util.h"
@@ -84,10 +81,10 @@ class WarningHostResolverProc : public net::HostResolverProc {
   }
 };
 
-class ChromeTestSuite : public base::TestSuite {
+class ChromeTestSuite : public TestSuite {
  public:
   ChromeTestSuite(int argc, char** argv)
-      : base::TestSuite(argc, argv),
+      : TestSuite(argc, argv),
         stats_table_(NULL),
         created_user_data_dir_(false) {
   }
@@ -97,7 +94,7 @@ class ChromeTestSuite : public base::TestSuite {
   virtual void Initialize() {
     base::ScopedNSAutoreleasePool autorelease_pool;
 
-    base::TestSuite::Initialize();
+    TestSuite::Initialize();
 
     chrome::RegisterChromeSchemes();
     host_resolver_proc_ = new WarningHostResolverProc();
@@ -175,7 +172,7 @@ class ChromeTestSuite : public base::TestSuite {
       file_util::Delete(user_data_dir, true);
       file_util::Delete(user_data_dir.DirName(), false);
     }
-    base::TestSuite::Shutdown();
+    TestSuite::Shutdown();
   }
 
   void SetBrowserDirectory(const FilePath& browser_dir) {