diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-18 22:34:36 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-18 22:34:36 +0000 |
| commit | e4feed08884b1b1bd3af3986e56ca60c3d62a7da (patch) | |
| tree | bbfa158eb296bb9e5b329efac64e3b8e36a7b3eb /chrome/test/unit | |
| parent | 70b45efc15674aa7241bbb95dc81b3019eac294b (diff) | |
| download | chromium_src-e4feed08884b1b1bd3af3986e56ca60c3d62a7da.zip chromium_src-e4feed08884b1b1bd3af3986e56ca60c3d62a7da.tar.gz chromium_src-e4feed08884b1b1bd3af3986e56ca60c3d62a7da.tar.bz2 | |
Try to land strings on linux again (r9972). This time, enable
the resource bundle on linux unittests and make the unit_tests
executable require the various .pak files.
Review URL: http://codereview.chromium.org/20471
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9984 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/unit')
| -rw-r--r-- | chrome/test/unit/chrome_test_suite.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h index 705960b..79c5e19 100644 --- a/chrome/test/unit/chrome_test_suite.h +++ b/chrome/test/unit/chrome_test_suite.h @@ -15,7 +15,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_LINUX) // TODO(port): Remove the #ifdef when ResourceBundle is ported. #include "chrome/common/resource_bundle.h" #endif @@ -49,7 +49,7 @@ protected: if (!user_data_dir.empty()) PathService::Override(chrome::DIR_USER_DATA, user_data_dir); -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_LINUX) // TODO(port): Remove the #ifdef when ResourceBundle is ported. // // Force unittests to run using en-us so if we test against string @@ -67,7 +67,7 @@ protected: } virtual void Shutdown() { -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_LINUX) // TODO(port): Remove the #ifdef when ResourceBundle is ported. ResourceBundle::CleanupSharedInstance(); #endif |