diff options
| author | Ari Hausman-Cohen <arihc@google.com> | 2015-08-04 13:47:50 -0700 |
|---|---|---|
| committer | Ari Hausman-Cohen <arihc@google.com> | 2015-08-13 12:26:12 -0700 |
| commit | 999773c87b1935713c309e6209255570ec4c7c88 (patch) | |
| tree | 4d64a1274b4d6b74d11d861595b0e0898f5a4d7f /base | |
| parent | 1ad3000647abb4e86484f68aa387def88294d82b (diff) | |
| download | libchrome-999773c87b1935713c309e6209255570ec4c7c88.tar.gz | |
Fixing unit tests to pass when run.
Submitted before chromium cl 1273243002 went through, CQ found
issue that is fixed here.
BUG: 22884411, 22947438
Change-Id: Ib91967ce6cdd60d4c923822b0fa52c40661070fe
Diffstat (limited to 'base')
| -rw-r--r-- | base/files/file_path_unittest.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/base/files/file_path_unittest.cc b/base/files/file_path_unittest.cc index bdfbb3014d..97851ea06d 100644 --- a/base/files/file_path_unittest.cc +++ b/base/files/file_path_unittest.cc @@ -11,6 +11,10 @@ #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" +#if defined(OS_POSIX) +#include "base/test/scoped_locale.h" +#endif + // This macro helps avoid wrapped lines in the test structs. #define FPL(x) FILE_PATH_LITERAL(x) @@ -1127,7 +1131,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) { "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" }, }; -#if !defined(SYSTEM_NATIVE_UTF8) +#if !defined(SYSTEM_NATIVE_UTF8) && defined(OS_LINUX) ScopedLocale locale("en_US.UTF-8"); #endif |