summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/renderer_main_unittest.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-17 19:40:11 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-17 19:40:11 +0000
commit20e14913cdb627bc6d6751dedc18fe23c3893671 (patch)
tree81654b4186f92345c8435bf10579aca31b14543a /chrome/renderer/renderer_main_unittest.cc
parent2045b41427fd10137d9c97dbc3d2ab536fd45480 (diff)
downloadchromium_src-20e14913cdb627bc6d6751dedc18fe23c3893671.zip
chromium_src-20e14913cdb627bc6d6751dedc18fe23c3893671.tar.gz
chromium_src-20e14913cdb627bc6d6751dedc18fe23c3893671.tar.bz2
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
Diffstat (limited to 'chrome/renderer/renderer_main_unittest.cc')
-rw-r--r--chrome/renderer/renderer_main_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/renderer/renderer_main_unittest.cc b/chrome/renderer/renderer_main_unittest.cc
index f329337..f30103c 100644
--- a/chrome/renderer/renderer_main_unittest.cc
+++ b/chrome/renderer/renderer_main_unittest.cc
@@ -1,15 +1,16 @@
-// 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.
#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)
@@ -22,9 +23,8 @@ 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 MultiProcessTest {
+class RendererMainTest : public base::MultiProcessTest {
protected:
-
// Create a new MessageLoopForIO For each test.
virtual void SetUp();
virtual void TearDown();