Re-land part of r55416, minus actually moving the test_suite.h contents to a .cc file.

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


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

14 files changed, 372 insertions, 296 deletions

diff --git a/base/DEPS b/base/DEPS
index 24e3365..21793f6 100644
--- a/base/DEPS
+++ b/base/DEPS
@@ -5,9 +5,6 @@ include_rules = [
   "+third_party/modp_b64",
   "+third_party/tcmalloc",
 
-  # Testing stuff shouldn't be used by the general base code.
-  "-base/test",
-
   # ICU dependendencies must be separate from the rest of base.
   "-i18n",
 ]
diff --git a/base/base.gyp b/base/base.gyp
index 5fc3ef2..85d71ca 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -55,7 +55,6 @@
       'msvs_guid': '27A30967-4BBA-48D1-8522-CDE95F7B1CEC',
       'sources': [
         # Infrastructure files.
-        'multiprocess_test.h',
         'test/run_all_unittests.cc',
 
         # Tests.
@@ -243,6 +242,9 @@
         }],
       ],
       'sources': [
+        'test/multiprocess_test.cc',
+        'test/multiprocess_test.h',
+        'test/perf_test_suite.h',
         'test/test_file_util.h',
         'test/test_file_util_linux.cc',
         'test/test_file_util_mac.cc',
diff --git a/base/base_switches.cc b/base/base_switches.cc
index 2613623..b5e145f 100644
--- a/base/base_switches.cc
+++ b/base/base_switches.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -11,27 +11,27 @@ namespace switches {
 // seconds for the debugger to attach to itself. Then a break point will be hit.
 const char kDebugOnStart[]                  = "debug-on-start";
 
-// Will wait for 60 seconds for a debugger to come to attach to the process.
-const char kWaitForDebugger[]               = "wait-for-debugger";
-
-// Suppresses all error dialogs when present.
-const char kNoErrorDialogs[]                = "noerrdialogs";
-
 // Disables the crash reporting.
 const char kDisableBreakpad[]               = "disable-breakpad";
 
+// Enable DCHECKs in release mode.
+const char kEnableDCHECK[]                  = "enable-dcheck";
+
 // Generates full memory crash dump.
 const char kFullMemoryCrashReport[]         = "full-memory-crash-report";
 
-// The value of this switch determines whether the process is started as a
-// renderer or plugin host.  If it's empty, it's the browser.
-const char kProcessType[]                   = "type";
-
-// Enable DCHECKs in release mode.
-const char kEnableDCHECK[]                  = "enable-dcheck";
+// Suppresses all error dialogs when present.
+const char kNoErrorDialogs[]                = "noerrdialogs";
 
 // Disable win_util::MessageBox.  This is useful when running as part of
 // scripts that do not have a user interface.
 const char kNoMessageBox[]                  = "no-message-box";
 
+// When running certain tests that spawn child processes, this switch indicates
+// to the test framework that the current process is a child process.
+const char kTestChildProcess[]              = "test-child-process";
+
+// Will wait for 60 seconds for a debugger to come to attach to the process.
+const char kWaitForDebugger[]               = "wait-for-debugger";
+
 }  // namespace switches
diff --git a/base/base_switches.h b/base/base_switches.h
index 4c01d1f..6fe3842 100644
--- a/base/base_switches.h
+++ b/base/base_switches.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -11,13 +11,13 @@
 namespace switches {
 
 extern const char kDebugOnStart[];
-extern const char kWaitForDebugger[];
 extern const char kDisableBreakpad[];
+extern const char kEnableDCHECK[];
 extern const char kFullMemoryCrashReport[];
 extern const char kNoErrorDialogs[];
-extern const char kProcessType[];
-extern const char kEnableDCHECK[];
 extern const char kNoMessageBox[];
+extern const char kTestChildProcess[];
+extern const char kWaitForDebugger[];
 
 }  // namespace switches
 
diff --git a/base/multiprocess_test.h b/base/multiprocess_test.h
deleted file mode 100644
index 37d5228..0000000
--- a/base/multiprocess_test.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright (c) 2009 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.
-
-#ifndef BASE_MULTIPROCESS_TEST_H_
-#define BASE_MULTIPROCESS_TEST_H_
-#pragma once
-
-#include "base/base_switches.h"
-#include "base/command_line.h"
-#include "base/process_util.h"
-#include "base/string_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "testing/multiprocess_func_list.h"
-#include "testing/platform_test.h"
-
-#if defined(OS_POSIX)
-#include <sys/types.h>
-#include <unistd.h>
-#endif
-
-// Command line switch to invoke a child process rather than
-// to run the normal test suite.
-static const char kRunClientProcess[] = "client";
-
-// A MultiProcessTest is a test class which makes it easier to
-// write a test which requires code running out of process.
-//
-// To create a multiprocess test simply follow these steps:
-//
-// 1) Derive your test from MultiProcessTest. Example:
-//
-//    class MyTest : public MultiProcessTest {
-//    };
-//
-//    TEST_F(MyTest, TestCaseName) {
-//      ...
-//    }
-//
-// 2) Create a mainline function for the child processes and include
-//    testing/multiprocess_func_list.h.
-//    See the declaration of the MULTIPROCESS_TEST_MAIN macro
-//    in that file for an example.
-// 3) Call SpawnChild("foo"), where "foo" is the name of
-//    the function you wish to run in the child processes.
-// That's it!
-//
-class MultiProcessTest : public PlatformTest {
- protected:
-  // Run a child process.
-  // 'procname' is the name of a function which the child will
-  // execute.  It must be exported from this library in order to
-  // run.
-  //
-  // Example signature:
-  //    extern "C" int __declspec(dllexport) FooBar() {
-  //         // do client work here
-  //    }
-  //
-  // Returns the handle to the child, or NULL on failure
-  //
-  // TODO(darin): re-enable this once we have base/debug_util.h
-  // ProcessDebugFlags(&cl, DebugUtil::UNKNOWN, false);
-  base::ProcessHandle SpawnChild(const std::string& procname) {
-    return SpawnChild(procname, false);
-  }
-
-  base::ProcessHandle SpawnChild(const std::string& procname,
-                                 bool debug_on_start) {
-#if defined(OS_WIN)
-    return SpawnChildImpl(procname, debug_on_start);
-#elif defined(OS_POSIX)
-    base::file_handle_mapping_vector empty_file_list;
-    return SpawnChildImpl(procname, empty_file_list, debug_on_start);
-#endif
-  }
-
-#if defined(OS_POSIX)
-  base::ProcessHandle SpawnChild(
-      const std::string& procname,
-      const base::file_handle_mapping_vector& fds_to_map,
-      bool debug_on_start) {
-    return SpawnChildImpl(procname, fds_to_map, debug_on_start);
-  }
-#endif
-
-protected:
-  CommandLine MakeCmdLine(const std::string& procname, bool debug_on_start) {
-    CommandLine cl(*CommandLine::ForCurrentProcess());
-    cl.AppendSwitchASCII(kRunClientProcess, procname);
-    if (debug_on_start)
-      cl.AppendSwitch(switches::kDebugOnStart);
-    return cl;
-  }
-
- private:
-#if defined(OS_WIN)
-  base::ProcessHandle SpawnChildImpl(const std::string& procname,
-                                     bool debug_on_start) {
-    base::ProcessHandle handle = static_cast<base::ProcessHandle>(NULL);
-    base::LaunchApp(MakeCmdLine(procname, debug_on_start),
-                    false, true, &handle);
-    return handle;
-  }
-
-#elif defined(OS_POSIX)
-  // TODO(port): with the CommandLine refactoring, this code is very similar
-  // to the Windows code.  Investigate whether this can be made shorter.
-  base::ProcessHandle SpawnChildImpl(
-      const std::string& procname,
-      const base::file_handle_mapping_vector& fds_to_map,
-      bool debug_on_start) {
-    base::ProcessHandle handle = base::kNullProcessHandle;
-    base::LaunchApp(MakeCmdLine(procname, debug_on_start).argv(),
-                    fds_to_map, false, &handle);
-    return handle;
-  }
-#endif
-};
-
-#endif  // BASE_MULTIPROCESS_TEST_H_
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc
index 6f4ed39..645ef77 100644
--- a/base/process_util_unittest.cc
+++ b/base/process_util_unittest.cc
@@ -9,13 +9,14 @@
 #include "base/command_line.h"
 #include "base/eintr_wrapper.h"
 #include "base/file_path.h"
-#include "base/multiprocess_test.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
+#include "base/test/multiprocess_test.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/multiprocess_func_list.h"
 
 #if defined(OS_LINUX)
 #include <errno.h>
@@ -62,7 +63,7 @@ void SignalChildren(const char* filename) {
 
 }  // namespace
 
-class ProcessUtilTest : public MultiProcessTest {
+class ProcessUtilTest : public base::MultiProcessTest {
 #if defined(OS_POSIX)
  public:
   // Spawn a child process that counts how many file descriptors are open.
@@ -75,7 +76,7 @@ MULTIPROCESS_TEST_MAIN(SimpleChildProcess) {
 }
 
 TEST_F(ProcessUtilTest, SpawnChild) {
-  base::ProcessHandle handle = this->SpawnChild("SimpleChildProcess");
+  base::ProcessHandle handle = this->SpawnChild("SimpleChildProcess", false);
   ASSERT_NE(base::kNullProcessHandle, handle);
   EXPECT_TRUE(base::WaitForSingleProcess(handle, 5000));
   base::CloseProcessHandle(handle);
@@ -88,7 +89,7 @@ MULTIPROCESS_TEST_MAIN(SlowChildProcess) {
 
 TEST_F(ProcessUtilTest, KillSlowChild) {
   remove("SlowChildProcess.die");
-  base::ProcessHandle handle = this->SpawnChild("SlowChildProcess");
+  base::ProcessHandle handle = this->SpawnChild("SlowChildProcess", false);
   ASSERT_NE(base::kNullProcessHandle, handle);
   SignalChildren("SlowChildProcess.die");
   EXPECT_TRUE(base::WaitForSingleProcess(handle, 5000));
@@ -98,7 +99,7 @@ TEST_F(ProcessUtilTest, KillSlowChild) {
 
 TEST_F(ProcessUtilTest, DidProcessCrash) {
   remove("SlowChildProcess.die");
-  base::ProcessHandle handle = this->SpawnChild("SlowChildProcess");
+  base::ProcessHandle handle = this->SpawnChild("SlowChildProcess", false);
   ASSERT_NE(base::kNullProcessHandle, handle);
 
   bool child_exited = true;
@@ -118,7 +119,7 @@ TEST_F(ProcessUtilTest, DidProcessCrash) {
 // Note: a platform may not be willing or able to lower the priority of
 // a process. The calls to SetProcessBackground should be noops then.
 TEST_F(ProcessUtilTest, SetProcessBackgrounded) {
-  base::ProcessHandle handle = this->SpawnChild("SimpleChildProcess");
+  base::ProcessHandle handle = this->SpawnChild("SimpleChildProcess", false);
   base::Process process(handle);
   int old_priority = process.GetPriority();
   process.SetProcessBackgrounded(true);
diff --git a/base/shared_memory_unittest.cc b/base/shared_memory_unittest.cc
index 88b5fa0..4e83311 100644
--- a/base/shared_memory_unittest.cc
+++ b/base/shared_memory_unittest.cc
@@ -3,12 +3,13 @@
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
-#include "base/multiprocess_test.h"
 #include "base/platform_thread.h"
 #include "base/scoped_nsautorelease_pool.h"
 #include "base/shared_memory.h"
 #include "base/scoped_ptr.h"
+#include "base/test/multiprocess_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/multiprocess_func_list.h"
 
 static const int kNumThreads = 5;
 static const int kNumTasks = 5;
@@ -271,13 +272,11 @@ TEST(SharedMemoryTest, AnonymousPrivate) {
   for (int i = 0; i < count; i++) {
     memories[i].Close();
   }
-
 }
 
-
 // On POSIX it is especially important we test shmem across processes,
 // not just across threads.  But the test is enabled on all platforms.
-class SharedMemoryProcessTest : public MultiProcessTest {
+class SharedMemoryProcessTest : public base::MultiProcessTest {
  public:
 
   static void CleanUp() {
@@ -326,7 +325,7 @@ TEST_F(SharedMemoryProcessTest, Tasks) {
 
   base::ProcessHandle handles[kNumTasks];
   for (int index = 0; index < kNumTasks; ++index) {
-    handles[index] = SpawnChild("SharedMemoryTestMain");
+    handles[index] = SpawnChild("SharedMemoryTestMain", false);
   }
 
   int exit_code = 0;
@@ -342,5 +341,4 @@ MULTIPROCESS_TEST_MAIN(SharedMemoryTestMain) {
   return SharedMemoryProcessTest::TaskTestMain();
 }
 
-
 }  // namespace base
diff --git a/base/stats_table_unittest.cc b/base/stats_table_unittest.cc
index 848ef97..db8057c 100644
--- a/base/stats_table_unittest.cc
+++ b/base/stats_table_unittest.cc
@@ -7,12 +7,14 @@
 #include <windows.h>
 #endif
 
-#include "base/multiprocess_test.h"
 #include "base/platform_thread.h"
 #include "base/simple_thread.h"
 #include "base/shared_memory.h"
 #include "base/stats_table.h"
 #include "base/stats_counters.h"
+#include "base/string_piece.h"
+#include "base/string_util.h"
+#include "base/test/multiprocess_test.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
@@ -204,7 +206,7 @@ TEST_F(StatsTableTest, MultipleProcesses) {
 
   // Spawn the processes.
   for (int16 index = 0; index < kMaxProcs; index++) {
-    procs[index] = this->SpawnChild("StatsTableMultipleProcessMain");
+    procs[index] = this->SpawnChild("StatsTableMultipleProcessMain", false);
     EXPECT_NE(base::kNullProcessHandle, procs[index]);
   }
 
diff --git a/base/test/multiprocess_test.cc b/base/test/multiprocess_test.cc
new file mode 100644
index 0000000..a1a3bbe
--- /dev/null
+++ b/base/test/multiprocess_test.cc
@@ -0,0 +1,74 @@
+// Copyright (c) 2010 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/multiprocess_test.h"
+
+#include "base/base_switches.h"
+#include "base/command_line.h"
+
+#if defined(OS_POSIX)
+#include <sys/types.h>
+#include <unistd.h>
+#endif
+
+namespace base {
+
+MultiProcessTest::MultiProcessTest() {
+}
+
+ProcessHandle MultiProcessTest::SpawnChild(const std::string& procname,
+                                           bool debug_on_start) {
+#if defined(OS_WIN)
+  return SpawnChildImpl(procname, debug_on_start);
+#elif defined(OS_POSIX)
+  file_handle_mapping_vector empty_file_list;
+  return SpawnChildImpl(procname, empty_file_list, debug_on_start);
+#endif
+}
+
+#if defined(OS_POSIX)
+ProcessHandle MultiProcessTest::SpawnChild(
+    const std::string& procname,
+    const file_handle_mapping_vector& fds_to_map,
+    bool debug_on_start) {
+  return SpawnChildImpl(procname, fds_to_map, debug_on_start);
+}
+#endif
+
+CommandLine MultiProcessTest::MakeCmdLine(const std::string& procname,
+                                          bool debug_on_start) {
+  CommandLine cl(*CommandLine::ForCurrentProcess());
+  cl.AppendSwitchASCII(switches::kTestChildProcess, procname);
+  if (debug_on_start)
+    cl.AppendSwitch(switches::kDebugOnStart);
+  return cl;
+}
+
+#if defined(OS_WIN)
+
+ProcessHandle MultiProcessTest::SpawnChildImpl(const std::string& procname,
+                                               bool debug_on_start) {
+  ProcessHandle handle = static_cast<ProcessHandle>(NULL);
+  LaunchApp(MakeCmdLine(procname, debug_on_start),
+                  false, true, &handle);
+  return handle;
+}
+
+#elif defined(OS_POSIX)
+
+// TODO(port): with the CommandLine refactoring, this code is very similar
+// to the Windows code.  Investigate whether this can be made shorter.
+ProcessHandle MultiProcessTest::SpawnChildImpl(
+    const std::string& procname,
+    const file_handle_mapping_vector& fds_to_map,
+    bool debug_on_start) {
+  ProcessHandle handle = kNullProcessHandle;
+  LaunchApp(MakeCmdLine(procname, debug_on_start).argv(),
+                  fds_to_map, false, &handle);
+  return handle;
+}
+
+#endif
+
+}  // namespace base
diff --git a/base/test/multiprocess_test.h b/base/test/multiprocess_test.h
new file mode 100644
index 0000000..5126abe
--- /dev/null
+++ b/base/test/multiprocess_test.h
@@ -0,0 +1,86 @@
+// Copyright (c) 2010 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.
+
+#ifndef BASE_TEST_MULTIPROCESS_TEST_H_
+#define BASE_TEST_MULTIPROCESS_TEST_H_
+#pragma once
+
+#include <string>
+
+#include "base/basictypes.h"
+#include "base/process.h"
+#include "base/process_util.h"
+#include "build/build_config.h"
+#include "testing/platform_test.h"
+
+class CommandLine;
+
+namespace base {
+
+// A MultiProcessTest is a test class which makes it easier to
+// write a test which requires code running out of process.
+//
+// To create a multiprocess test simply follow these steps:
+//
+// 1) Derive your test from MultiProcessTest. Example:
+//
+//    class MyTest : public MultiProcessTest {
+//    };
+//
+//    TEST_F(MyTest, TestCaseName) {
+//      ...
+//    }
+//
+// 2) Create a mainline function for the child processes and include
+//    testing/multiprocess_func_list.h.
+//    See the declaration of the MULTIPROCESS_TEST_MAIN macro
+//    in that file for an example.
+// 3) Call SpawnChild("foo"), where "foo" is the name of
+//    the function you wish to run in the child processes.
+// That's it!
+class MultiProcessTest : public PlatformTest {
+ public:
+  MultiProcessTest();
+
+ protected:
+  // Run a child process.
+  // 'procname' is the name of a function which the child will
+  // execute.  It must be exported from this library in order to
+  // run.
+  //
+  // Example signature:
+  //    extern "C" int __declspec(dllexport) FooBar() {
+  //         // do client work here
+  //    }
+  //
+  // Returns the handle to the child, or NULL on failure
+  ProcessHandle SpawnChild(const std::string& procname, bool debug_on_start);
+
+#if defined(OS_POSIX)
+  ProcessHandle SpawnChild(const std::string& procname,
+                           const file_handle_mapping_vector& fds_to_map,
+                           bool debug_on_start);
+#endif
+
+  CommandLine MakeCmdLine(const std::string& procname, bool debug_on_start);
+
+ private:
+#if defined(OS_WIN)
+  ProcessHandle SpawnChildImpl(const std::string& procname,
+                               bool debug_on_start);
+
+#elif defined(OS_POSIX)
+  // TODO(port): with the CommandLine refactoring, this code is very similar
+  // to the Windows code.  Investigate whether this can be made shorter.
+  ProcessHandle SpawnChildImpl(const std::string& procname,
+                               const file_handle_mapping_vector& fds_to_map,
+                               bool debug_on_start);
+#endif
+
+ DISALLOW_COPY_AND_ASSIGN(MultiProcessTest);
+};
+
+}  // namespace base
+
+#endif  // BASE_TEST_MULTIPROCESS_TEST_H_
diff --git a/base/test/perf_test_suite.h b/base/test/perf_test_suite.h
index bac5a63..37abea6 100644
--- a/base/test/perf_test_suite.h
+++ b/base/test/perf_test_suite.h
@@ -9,10 +9,12 @@
 #include "base/command_line.h"
 #include "base/debug_util.h"
 #include "base/file_path.h"
+#include "base/path_service.h"
 #include "base/perftimer.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/test/test_suite.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 class PerfTestSuite : public TestSuite {
  public:
diff --git a/base/test/run_all_unittests.cc b/base/test/run_all_unittests.cc
index 841b353..8bfeb3b 100644
--- a/base/test/run_all_unittests.cc
+++ b/base/test/run_all_unittests.cc
@@ -5,5 +5,5 @@
 #include "base/test/test_suite.h"
 
 int main(int argc, char** argv) {
-  return TestSuite(argc, argv).Run();
+  return base::TestSuite(argc, argv).Run();
 }
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
index a374034..6df1fb9 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -6,16 +6,19 @@
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
+#include "base/base_switches.h"
+#include "base/command_line.h"
 #include "base/debug_on_start.h"
 #include "base/debug_util.h"
 #include "base/file_path.h"
 #include "base/i18n/icu_util.h"
-#include "base/multiprocess_test.h"
+#include "base/logging.h"
 #include "base/nss_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/scoped_nsautorelease_pool.h"
 #include "base/scoped_ptr.h"
+#include "base/test/multiprocess_test.h"
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
@@ -24,6 +27,22 @@
 #include <gtk/gtk.h>
 #endif
 
+namespace {
+
+class MaybeTestDisabler : public testing::EmptyTestEventListener {
+ public:
+  virtual void OnTestStart(const testing::TestInfo& test_info) {
+    ASSERT_FALSE(TestSuite::IsMarkedMaybe(test_info))
+        << "Probably the OS #ifdefs don't include all of the necessary "
+           "platforms.\nPlease ensure that no tests have the MAYBE_ prefix "
+           "after the code is preprocessed.";
+  }
+};
+
+}  // namespace
+
+const char TestSuite::kStrictFailureHandling[] = "strict_failure_handling";
+
 TestSuite::TestSuite(int argc, char** argv) {
   base::EnableTerminationOnHeapCorruption();
   CommandLine::Init(argc, argv);
@@ -36,6 +55,60 @@ TestSuite::TestSuite(int argc, char** argv) {
   // Initialize().  See bug 6436.
 }
 
+TestSuite::~TestSuite() {
+  CommandLine::Reset();
+}
+
+// static
+bool TestSuite::IsMarkedFlaky(const testing::TestInfo& test) {
+  return strncmp(test.name(), "FLAKY_", 6) == 0;
+}
+
+// static
+bool TestSuite::IsMarkedFailing(const testing::TestInfo& test) {
+  return strncmp(test.name(), "FAILS_", 6) == 0;
+}
+
+// static
+bool TestSuite::IsMarkedMaybe(const testing::TestInfo& test) {
+  return strncmp(test.name(), "MAYBE_", 6) == 0;
+}
+
+// static
+bool TestSuite::ShouldIgnoreFailure(const testing::TestInfo& test) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(kStrictFailureHandling))
+    return false;
+  return IsMarkedFlaky(test) || IsMarkedFailing(test);
+}
+
+// static
+bool TestSuite::NonIgnoredFailures(const testing::TestInfo& test) {
+  return test.should_run() && test.result()->Failed() &&
+      !ShouldIgnoreFailure(test);
+}
+
+int TestSuite::GetTestCount(TestMatch test_match) {
+  testing::UnitTest* instance = testing::UnitTest::GetInstance();
+  int count = 0;
+
+  for (int i = 0; i < instance->total_test_case_count(); ++i) {
+    const testing::TestCase& test_case = *instance->GetTestCase(i);
+    for (int j = 0; j < test_case.total_test_count(); ++j) {
+      if (test_match(*test_case.GetTestInfo(j))) {
+        count++;
+      }
+    }
+  }
+
+  return count;
+}
+
+void TestSuite::CatchMaybeTests() {
+  testing::TestEventListeners& listeners =
+      testing::UnitTest::GetInstance()->listeners();
+  listeners.Append(new MaybeTestDisabler);
+}
+
 // Don't add additional code to this method.  Instead add it to
 // Initialize().  See bug 6436.
 int TestSuite::Run() {
@@ -44,7 +117,7 @@ int TestSuite::Run() {
   Initialize();
   std::string client_func =
       CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          kRunClientProcess);
+          switches::kTestChildProcess);
   // Check to see if we are being run as a client process.
   if (!client_func.empty())
     return multi_process_function_list::InvokeChildProcessTest(client_func);
@@ -77,3 +150,65 @@ int TestSuite::Run() {
 
   return result;
 }
+
+// static
+void TestSuite::UnitTestAssertHandler(const std::string& str) {
+  RAW_LOG(FATAL, str.c_str());
+}
+
+void TestSuite::SuppressErrorDialogs() {
+#if defined(OS_WIN)
+  UINT new_flags = SEM_FAILCRITICALERRORS |
+                   SEM_NOGPFAULTERRORBOX |
+                   SEM_NOOPENFILEERRORBOX;
+
+  // Preserve existing error mode, as discussed at
+  // http://blogs.msdn.com/oldnewthing/archive/2004/07/27/198410.aspx
+  UINT existing_flags = SetErrorMode(new_flags);
+  SetErrorMode(existing_flags | new_flags);
+#endif  // defined(OS_WIN)
+}
+
+void TestSuite::Initialize() {
+  // Initialize logging.
+  FilePath exe;
+  PathService::Get(base::FILE_EXE, &exe);
+  FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log"));
+  logging::InitLogging(log_filename.value().c_str(),
+                       logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
+                       logging::LOCK_LOG_FILE,
+                       logging::DELETE_OLD_LOG_FILE);
+  // We want process and thread IDs because we may have multiple processes.
+  // Note: temporarily enabled timestamps in an effort to catch bug 6361.
+  logging::SetLogItems(true, true, true, true);
+
+  CHECK(base::EnableInProcessStackDumping());
+#if defined(OS_WIN)
+  // Make sure we run with high resolution timer to minimize differences
+  // between production code and test code.
+  base::Time::EnableHighResolutionTimer(true);
+#endif  // defined(OS_WIN)
+
+  // In some cases, we do not want to see standard error dialogs.
+  if (!DebugUtil::BeingDebugged() &&
+      !CommandLine::ForCurrentProcess()->HasSwitch("show-error-dialogs")) {
+    SuppressErrorDialogs();
+    DebugUtil::SuppressDialogs();
+    logging::SetLogAssertHandler(UnitTestAssertHandler);
+  }
+
+  icu_util::Initialize();
+
+#if defined(USE_NSS)
+  // Trying to repeatedly initialize and cleanup NSS and NSPR may result in
+  // a deadlock. Such repeated initialization will happen when using test
+  // isolation. Prevent problems by initializing NSS here, so that the cleanup
+  // will be done only on process exit.
+  base::EnsureNSSInit();
+#endif  // defined(USE_NSS)
+
+  CatchMaybeTests();
+}
+
+void TestSuite::Shutdown() {
+}
diff --git a/base/test/test_suite.h b/base/test/test_suite.h
index c0a2891..2d4352b 100644
--- a/base/test/test_suite.h
+++ b/base/test/test_suite.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -10,178 +10,78 @@
 // instantiate this class in your main function and call its Run method to run
 // any gtest based tests that are linked into your executable.
 
+#include <string>
+
 #include "base/at_exit.h"
-#include "base/base_paths.h"
-#include "base/debug_on_start.h"
-#include "base/debug_util.h"
-#include "base/file_path.h"
-#include "base/i18n/icu_util.h"
-#include "base/multiprocess_test.h"
-#include "base/nss_util.h"
-#include "base/path_service.h"
-#include "base/process_util.h"
-#include "base/scoped_nsautorelease_pool.h"
-#include "base/scoped_ptr.h"
-#include "base/time.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "testing/multiprocess_func_list.h"
-
-#if defined(TOOLKIT_USES_GTK)
-#include <gtk/gtk.h>
-#endif
-
-// A command-line flag that makes a test failure always result in a non-zero
-// process exit code.
-const char kStrictFailureHandling[] = "strict_failure_handling";
-
-// Match function used by the GetTestCount method.
-typedef bool (*TestMatch)(const testing::TestInfo&);
+
+namespace testing {
+class TestInfo;
+}
+
+namespace base {
 
 class TestSuite {
  public:
-  TestSuite(int argc, char** argv);
+  // Match function used by the GetTestCount method.
+  typedef bool (*TestMatch)(const testing::TestInfo&);
 
-  virtual ~TestSuite() {
-    CommandLine::Reset();
-  }
+  TestSuite(int argc, char** argv);
+  virtual ~TestSuite();
 
   // Returns true if the test is marked as flaky.
-  static bool IsMarkedFlaky(const testing::TestInfo& test) {
-    return strncmp(test.name(), "FLAKY_", 6) == 0;
-  }
+  static bool IsMarkedFlaky(const testing::TestInfo& test);
 
   // Returns true if the test is marked as failing.
-  static bool IsMarkedFailing(const testing::TestInfo& test) {
-    return strncmp(test.name(), "FAILS_", 6) == 0;
-  }
+  static bool IsMarkedFailing(const testing::TestInfo& test);
 
   // Returns true if the test is marked as "MAYBE_".
   // When using different prefixes depending on platform, we use MAYBE_ and
   // preprocessor directives to replace MAYBE_ with the target prefix.
-  static bool IsMarkedMaybe(const testing::TestInfo& test) {
-    return strncmp(test.name(), "MAYBE_", 6) == 0;
-  }
+  static bool IsMarkedMaybe(const testing::TestInfo& test);
 
   // Returns true if the test failure should be ignored.
-  static bool ShouldIgnoreFailure(const testing::TestInfo& test) {
-    if (CommandLine::ForCurrentProcess()->HasSwitch(kStrictFailureHandling))
-      return false;
-    return IsMarkedFlaky(test) || IsMarkedFailing(test);
-  }
+  static bool ShouldIgnoreFailure(const testing::TestInfo& test);
 
   // Returns true if the test failed and the failure shouldn't be ignored.
-  static bool NonIgnoredFailures(const testing::TestInfo& test) {
-    return test.should_run() && test.result()->Failed() &&
-        !ShouldIgnoreFailure(test);
-  }
+  static bool NonIgnoredFailures(const testing::TestInfo& test);
 
   // Returns the number of tests where the match function returns true.
-  int GetTestCount(TestMatch test_match) {
-    testing::UnitTest* instance = testing::UnitTest::GetInstance();
-    int count = 0;
-
-    for (int i = 0; i < instance->total_test_case_count(); ++i) {
-      const testing::TestCase& test_case = *instance->GetTestCase(i);
-      for (int j = 0; j < test_case.total_test_count(); ++j) {
-        if (test_match(*test_case.GetTestInfo(j))) {
-          count++;
-        }
-      }
-    }
-
-    return count;
-  }
-
-  void CatchMaybeTests() {
-    testing::TestEventListeners& listeners =
-        testing::UnitTest::GetInstance()->listeners();
-    listeners.Append(new MaybeTestDisabler);
-  }
+  int GetTestCount(TestMatch test_match);
+
+  void CatchMaybeTests();
 
   int Run();
 
- protected:
-  class MaybeTestDisabler : public testing::EmptyTestEventListener {
-   public:
-    virtual void OnTestStart(const testing::TestInfo& test_info) {
-      ASSERT_FALSE(TestSuite::IsMarkedMaybe(test_info))
-          << "Probably the OS #ifdefs don't include all of the necessary "
-             "platforms.\nPlease ensure that no tests have the MAYBE_ prefix "
-             "after the code is preprocessed.";
-    }
-  };
+  // A command-line flag that makes a test failure always result in a non-zero
+  // process exit code.
+  static const char kStrictFailureHandling[];
 
+ protected:
   // By default fatal log messages (e.g. from DCHECKs) result in error dialogs
   // which gum up buildbots. Use a minimalistic assert handler which just
   // terminates the process.
-  static void UnitTestAssertHandler(const std::string& str) {
-    RAW_LOG(FATAL, str.c_str());
-  }
+  static void UnitTestAssertHandler(const std::string& str);
 
   // Disable crash dialogs so that it doesn't gum up the buildbot
-  virtual void SuppressErrorDialogs() {
-#if defined(OS_WIN)
-    UINT new_flags = SEM_FAILCRITICALERRORS |
-                     SEM_NOGPFAULTERRORBOX |
-                     SEM_NOOPENFILEERRORBOX;
-
-    // Preserve existing error mode, as discussed at
-    // http://blogs.msdn.com/oldnewthing/archive/2004/07/27/198410.aspx
-    UINT existing_flags = SetErrorMode(new_flags);
-    SetErrorMode(existing_flags | new_flags);
-#endif  // defined(OS_WIN)
-  }
+  virtual void SuppressErrorDialogs();
 
   // Override these for custom initialization and shutdown handling.  Use these
   // instead of putting complex code in your constructor/destructor.
 
-  virtual void Initialize() {
-    // Initialize logging.
-    FilePath exe;
-    PathService::Get(base::FILE_EXE, &exe);
-    FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log"));
-    logging::InitLogging(log_filename.value().c_str(),
-                         logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
-                         logging::LOCK_LOG_FILE,
-                         logging::DELETE_OLD_LOG_FILE);
-    // We want process and thread IDs because we may have multiple processes.
-    // Note: temporarily enabled timestamps in an effort to catch bug 6361.
-    logging::SetLogItems(true, true, true, true);
-
-    CHECK(base::EnableInProcessStackDumping());
-#if defined(OS_WIN)
-    // Make sure we run with high resolution timer to minimize differences
-    // between production code and test code.
-    base::Time::EnableHighResolutionTimer(true);
-#endif  // defined(OS_WIN)
-
-    // In some cases, we do not want to see standard error dialogs.
-    if (!DebugUtil::BeingDebugged() &&
-        !CommandLine::ForCurrentProcess()->HasSwitch("show-error-dialogs")) {
-      SuppressErrorDialogs();
-      DebugUtil::SuppressDialogs();
-      logging::SetLogAssertHandler(UnitTestAssertHandler);
-    }
-
-    icu_util::Initialize();
-
-#if defined(USE_NSS)
-    // Trying to repeatedly initialize and cleanup NSS and NSPR may result in
-    // a deadlock. Such repeated initialization will happen when using test
-    // isolation. Prevent problems by initializing NSS here, so that the cleanup
-    // will be done only on process exit.
-    base::EnsureNSSInit();
-#endif  // defined(USE_NSS)
-
-    CatchMaybeTests();
-  }
-
-  virtual void Shutdown() {
-  }
+  virtual void Initialize();
+  virtual void Shutdown();
 
   // Make sure that we setup an AtExitManager so Singleton objects will be
   // destroyed.
   base::AtExitManager at_exit_manager_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestSuite);
 };
 
+}  // namespace base
+
+// TODO(brettw) remove this. This is a temporary hack to allow WebKit to compile
+// until we can update it to use "base::" (preventing a two-sided patch).
+using base::TestSuite;
+
 #endif  // BASE_TEST_TEST_SUITE_H_