diff options
| author | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 20:10:35 +0000 |
|---|---|---|
| committer | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 20:10:35 +0000 |
| commit | 5bfb6636b2aad4f9ead758800a40f481cabfd912 (patch) | |
| tree | cadbae44d0fafce43b245850bf8bc480a8bcf61a /app/l10n_util_unittest.cc | |
| parent | 61632f50030e10d199c2173cff940af5f264b428 (diff) | |
| download | chromium_src-5bfb6636b2aad4f9ead758800a40f481cabfd912.zip chromium_src-5bfb6636b2aad4f9ead758800a40f481cabfd912.tar.gz chromium_src-5bfb6636b2aad4f9ead758800a40f481cabfd912.tar.bz2 | |
Revert 16173
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/l10n_util_unittest.cc')
| -rw-r--r-- | app/l10n_util_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/l10n_util_unittest.cc b/app/l10n_util_unittest.cc index 3503c096..b1f8c93 100644 --- a/app/l10n_util_unittest.cc +++ b/app/l10n_util_unittest.cc @@ -4,7 +4,6 @@ #include "build/build_config.h" -#include "app/app_paths.h" #include "app/l10n_util.h" #if !defined(OS_MACOSX) #include "app/test/data/resource.h" @@ -17,6 +16,7 @@ #if defined(OS_WIN) #include "base/win_util.h" #endif +#include "chrome/common/chrome_paths.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "unicode/locid.h" @@ -100,12 +100,12 @@ TEST_F(L10nUtilTest, GetAppLocale) { // Use a temporary locale dir so we don't have to actually build the locale // dlls for this test. FilePath orig_locale_dir; - PathService::Get(app::DIR_LOCALES, &orig_locale_dir); + PathService::Get(chrome::DIR_LOCALES, &orig_locale_dir); FilePath new_locale_dir; EXPECT_TRUE(file_util::CreateNewTempDirectory( FILE_PATH_LITERAL("l10n_util_test"), &new_locale_dir)); - PathService::Override(app::DIR_LOCALES, new_locale_dir.ToWStringHack()); + PathService::Override(chrome::DIR_LOCALES, new_locale_dir.ToWStringHack()); // Make fake locale files. std::string filenames[] = { "en-US", @@ -204,7 +204,7 @@ TEST_F(L10nUtilTest, GetAppLocale) { #endif // Clean up. - PathService::Override(app::DIR_LOCALES, orig_locale_dir.ToWStringHack()); + PathService::Override(chrome::DIR_LOCALES, orig_locale_dir.ToWStringHack()); file_util::Delete(new_locale_dir, true); UErrorCode error_code = U_ZERO_ERROR; Locale::setDefault(locale, error_code); |