| Index: base/process_util_unittest.cc
 | 
| ===================================================================
 | 
| --- base/process_util_unittest.cc	(revision 55415)
 | 
| +++ base/process_util_unittest.cc	(working copy)
 | 
| @@ -9,14 +9,13 @@
 | 
|  #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>
 | 
| @@ -63,7 +62,7 @@
 | 
|  
 | 
|  }  // namespace
 | 
|  
 | 
| -class ProcessUtilTest : public base::MultiProcessTest {
 | 
| +class ProcessUtilTest : public MultiProcessTest {
 | 
|  #if defined(OS_POSIX)
 | 
|   public:
 | 
|    // Spawn a child process that counts how many file descriptors are open.
 | 
| @@ -76,7 +75,7 @@
 | 
|  }
 | 
|  
 | 
|  TEST_F(ProcessUtilTest, SpawnChild) {
 | 
| -  base::ProcessHandle handle = this->SpawnChild("SimpleChildProcess", false);
 | 
| +  base::ProcessHandle handle = this->SpawnChild("SimpleChildProcess");
 | 
|    ASSERT_NE(base::kNullProcessHandle, handle);
 | 
|    EXPECT_TRUE(base::WaitForSingleProcess(handle, 5000));
 | 
|    base::CloseProcessHandle(handle);
 | 
| @@ -89,7 +88,7 @@
 | 
|  
 | 
|  TEST_F(ProcessUtilTest, KillSlowChild) {
 | 
|    remove("SlowChildProcess.die");
 | 
| -  base::ProcessHandle handle = this->SpawnChild("SlowChildProcess", false);
 | 
| +  base::ProcessHandle handle = this->SpawnChild("SlowChildProcess");
 | 
|    ASSERT_NE(base::kNullProcessHandle, handle);
 | 
|    SignalChildren("SlowChildProcess.die");
 | 
|    EXPECT_TRUE(base::WaitForSingleProcess(handle, 5000));
 | 
| @@ -99,7 +98,7 @@
 | 
|  
 | 
|  TEST_F(ProcessUtilTest, DidProcessCrash) {
 | 
|    remove("SlowChildProcess.die");
 | 
| -  base::ProcessHandle handle = this->SpawnChild("SlowChildProcess", false);
 | 
| +  base::ProcessHandle handle = this->SpawnChild("SlowChildProcess");
 | 
|    ASSERT_NE(base::kNullProcessHandle, handle);
 | 
|  
 | 
|    bool child_exited = true;
 | 
| @@ -119,7 +118,7 @@
 | 
|  // 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", false);
 | 
| +  base::ProcessHandle handle = this->SpawnChild("SimpleChildProcess");
 | 
|    base::Process process(handle);
 | 
|    int old_priority = process.GetPriority();
 | 
|    process.SetProcessBackgrounded(true);
 | 
| 
 |