diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-08 14:44:44 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-08 14:44:44 +0000 |
| commit | 6f2660e7a1db2f25b95fd8b841abb38e313494a7 (patch) | |
| tree | 6f615f39c8550a868c837920fb8d21a2b6d7d222 /chrome/test/unit | |
| parent | ab182e455292e448df7b9011763d331c2874792a (diff) | |
| download | chromium_src-6f2660e7a1db2f25b95fd8b841abb38e313494a7.zip chromium_src-6f2660e7a1db2f25b95fd8b841abb38e313494a7.tar.gz chromium_src-6f2660e7a1db2f25b95fd8b841abb38e313494a7.tar.bz2 | |
Platform cleanup in common/
Review URL: http://codereview.chromium.org/10988
Patch from Pawel Hajdan Jr.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6506 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/unit')
| -rw-r--r-- | chrome/test/unit/chrome_test_suite.h | 21 | ||||
| -rw-r--r-- | chrome/test/unit/run_all_unittests.cc | 4 |
2 files changed, 13 insertions, 12 deletions
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h index 3ea6059..8847988 100644 --- a/chrome/test/unit/chrome_test_suite.h +++ b/chrome/test/unit/chrome_test_suite.h @@ -5,17 +5,21 @@ #ifndef CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_ #define CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_ +#include "build/build_config.h" + #include "base/stats_table.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/scoped_nsautorelease_pool.h" #include "base/test_suite.h" +#include "chrome/browser/browser_process.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#if defined(OS_WIN) // to be ported +#if defined(OS_WIN) +// TODO(port): Remove the #ifdef when ResourceBundle is ported. #include "chrome/common/resource_bundle.h" -#include "chrome/test/testing_browser_process.h" #endif +#include "chrome/test/testing_browser_process.h" class ChromeTestSuite : public TestSuite { public: @@ -26,13 +30,11 @@ protected: virtual void Initialize() { base::ScopedNSAutoreleasePool autorelease_pool; - + TestSuite::Initialize(); chrome::RegisterPathProvider(); -#if defined(OS_WIN) // to be ported g_browser_process = new TestingBrowserProcess; -#endif // Notice a user data override, and otherwise default to using a custom // user data directory that lives alongside the current app. @@ -46,7 +48,9 @@ protected: if (!user_data_dir.empty()) PathService::Override(chrome::DIR_USER_DATA, user_data_dir); -#if defined(OS_WIN) // to be ported +#if defined(OS_WIN) + // TODO(port): Remove the #ifdef when ResourceBundle is ported. + // // Force unittests to run using en-us so if we test against string // output, it'll pass regardless of the system language. ResourceBundle::InitSharedInstance(L"en-us"); @@ -59,12 +63,13 @@ protected: } virtual void Shutdown() { -#if defined(OS_WIN) // to be ported +#if defined(OS_WIN) + // TODO(port): Remove the #ifdef when ResourceBundle is ported. ResourceBundle::CleanupSharedInstance(); +#endif delete g_browser_process; g_browser_process = NULL; -#endif // Tear down shared StatsTable; prevents unit_tests from leaking it. StatsTable::set_current(NULL); diff --git a/chrome/test/unit/run_all_unittests.cc b/chrome/test/unit/run_all_unittests.cc index 84f1dae..8c162f1 100644 --- a/chrome/test/unit/run_all_unittests.cc +++ b/chrome/test/unit/run_all_unittests.cc @@ -2,11 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "build/build_config.h" #include "base/process_util.h" - -#include "base/test_suite.h" - #include "chrome/test/unit/chrome_test_suite.h" int main(int argc, char **argv) { |