Index: chrome/browser/download/download_util_unittest.cc |
diff --git a/chrome/browser/download/download_util_unittest.cc b/chrome/browser/download/download_util_unittest.cc |
index 1a905b194b46b46298a41316d6271e557926f80b..209b26092234971a31874366ff362c366760bb55 100644 |
--- a/chrome/browser/download/download_util_unittest.cc |
+++ b/chrome/browser/download/download_util_unittest.cc |
@@ -436,7 +436,9 @@ TEST(DownloadUtilTest, GenerateFileName) { |
// don't match our expectations. |
std::string locale = setlocale(LC_CTYPE, NULL); |
StringToLowerASCII(&locale); |
- EXPECT_NE(std::string::npos, locale.find("utf-8")) |
+ bool found = (locale.find("utf-8") != std::string::npos) || |
+ (locale.find("utf8") != std::string::npos); |
+ EXPECT_TRUE(found) |
Scott Hess - ex-Googler
2010/12/03 23:21:44
Don't include this change with the overall change.
|
<< "Your locale must be set to UTF-8 for this test to pass!"; |
#endif |