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

chrome/renderer/renderer_main_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "base/message_loop.h"
+#include "base/multiprocess_test.h"
 #include "base/process_util.h"
-#include "base/test/multiprocess_test.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/main_function_params.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "testing/multiprocess_func_list.h"
 
 // TODO(port): Bring up this test this on other platforms.
 #if defined(OS_POSIX)
 
 using base::ProcessHandle;
 
 const char kRendererTestChannelName[] = "test";
 
 extern int RendererMain(const MainFunctionParams& parameters);
 
 // TODO(port): The IPC Channel tests have a class with extremely similar
 // functionality, we should combine them.
-class RendererMainTest : public base::MultiProcessTest {
+class RendererMainTest : public MultiProcessTest {
  protected:
+
   // Create a new MessageLoopForIO For each test.
   virtual void SetUp();
   virtual void TearDown();
 
   // Spawns a child process of the specified type
   base::ProcessHandle SpawnChild(const std::string& procname,
                                  IPC::Channel* channel);
 
   // Created around each test instantiation.
   MessageLoopForIO *message_loop_;
@@ skipping 56 matching lines @@
 
   control_channel.Connect();
   MessageLoop::current()->Run();
 
   // The renderer should exit when we close the channel.
   control_channel.Close();
 
   EXPECT_TRUE(base::WaitForSingleProcess(renderer_pid, 5000));
 }
 #endif  // defined(OS_POSIX)