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

base/test/multiprocess_test.h

Index: base/test/multiprocess_test.h
===================================================================
--- base/test/multiprocess_test.h	(revision 55077)
+++ base/test/multiprocess_test.h	(working copy)
@@ -1,27 +1,22 @@
-// 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.
 
-#ifndef BASE_MULTIPROCESS_TEST_H_
-#define BASE_MULTIPROCESS_TEST_H_
+#ifndef BASE_TEST_MULTIPROCESS_TEST_H_
+#define BASE_TEST_MULTIPROCESS_TEST_H_
 #pragma once
 
-#include "base/base_switches.h"
-#include "base/command_line.h"
+#include <string>
+
+#include "base/basictypes.h"
+#include "base/process.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 "build/build_config.h"
 #include "testing/platform_test.h"
 
-#if defined(OS_POSIX)
-#include <sys/types.h>
-#include <unistd.h>
-#endif
+class CommandLine;
 
-// Command line switch to invoke a child process rather than
-// to run the normal test suite.
-static const char kRunClientProcess[] = "client";
+namespace base {
 
 // A MultiProcessTest is a test class which makes it easier to
 // write a test which requires code running out of process.
@@ -44,8 +39,10 @@
 // 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
@@ -58,64 +55,32 @@
   //    }
   //
   // 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);
-  }
+  ProcessHandle SpawnChild(const std::string& procname, bool debug_on_start);
 
-  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);
-  }
+  ProcessHandle SpawnChild(const std::string& procname,
+                           const file_handle_mapping_vector& fds_to_map,
+                           bool 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;
-  }
+  CommandLine MakeCmdLine(const std::string& procname, bool debug_on_start);
 
  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;
-  }
+  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.
-  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;
-  }
+  ProcessHandle SpawnChildImpl(const std::string& procname,
+                               const file_handle_mapping_vector& fds_to_map,
+                               bool debug_on_start);
 #endif
+
+ DISALLOW_COPY_AND_ASSIGN(MultiProcessTest);
 };
 
-#endif  // BASE_MULTIPROCESS_TEST_H_
+}  // namespace base
+
+#endif  // BASE_TEST_MULTIPROCESS_TEST_H_