diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 19:40:11 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 19:40:11 +0000 |
commit | 20e14913cdb627bc6d6751dedc18fe23c3893671 (patch) | |
tree | 81654b4186f92345c8435bf10579aca31b14543a /chrome/test/unit | |
parent | 2045b41427fd10137d9c97dbc3d2ab536fd45480 (diff) | |
download | chromium_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/test/unit')
-rw-r--r-- | chrome/test/unit/chrome_test_suite.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h index b788879..1cdd90f 100644 --- a/chrome/test/unit/chrome_test_suite.h +++ b/chrome/test/unit/chrome_test_suite.h @@ -12,9 +12,11 @@ #include "app/app_paths.h" #include "app/resource_bundle.h" +#include "base/command_line.h" #include "base/stats_table.h" #include "base/file_util.h" #include "base/path_service.h" +#include "base/process_util.h" #include "base/ref_counted.h" #include "base/scoped_nsautorelease_pool.h" #include "base/test/test_suite.h" @@ -28,6 +30,7 @@ #include "chrome/test/testing_browser_process.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_util.h" +#include "testing/gtest/include/gtest/gtest.h" #if defined(OS_MACOSX) #include "base/mac_util.h" @@ -81,10 +84,10 @@ class WarningHostResolverProc : public net::HostResolverProc { } }; -class ChromeTestSuite : public TestSuite { +class ChromeTestSuite : public base::TestSuite { public: ChromeTestSuite(int argc, char** argv) - : TestSuite(argc, argv), + : base::TestSuite(argc, argv), stats_table_(NULL), created_user_data_dir_(false) { } @@ -94,7 +97,7 @@ class ChromeTestSuite : public TestSuite { virtual void Initialize() { base::ScopedNSAutoreleasePool autorelease_pool; - TestSuite::Initialize(); + base::TestSuite::Initialize(); chrome::RegisterChromeSchemes(); host_resolver_proc_ = new WarningHostResolverProc(); @@ -172,7 +175,7 @@ class ChromeTestSuite : public TestSuite { file_util::Delete(user_data_dir, true); file_util::Delete(user_data_dir.DirName(), false); } - TestSuite::Shutdown(); + base::TestSuite::Shutdown(); } void SetBrowserDirectory(const FilePath& browser_dir) { |