Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4376)

Unified Diff: chrome/browser/download/download_util_unittest.cc

Issue 6241001: wstring: make net::GetSuggestedFilename return utf-16 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/download/download_util.cc ('k') | chrome/browser/download/save_package.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..f778ea859128940f7cdc09e216f94164c39f8422 100644
--- a/chrome/browser/download/download_util_unittest.cc
+++ b/chrome/browser/download/download_util_unittest.cc
@@ -188,11 +188,7 @@ const struct {
{"filename=..\\foo.txt",
"http://www.evil.com/..\\foo.txt",
"text/plain",
-#if defined(OS_WIN)
L"foo.txt"
-#else
- L"\\foo.txt"
-#endif
},
{"filename=.hidden",
@@ -437,7 +433,8 @@ TEST(DownloadUtilTest, GenerateFileName) {
std::string locale = setlocale(LC_CTYPE, NULL);
StringToLowerASCII(&locale);
EXPECT_NE(std::string::npos, locale.find("utf-8"))
- << "Your locale must be set to UTF-8 for this test to pass!";
+ << "Your locale (" << locale << ") must be set to UTF-8 "
+ << "for this test to pass!";
#endif
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kGenerateFileNameTestCases); ++i) {
« no previous file with comments | « chrome/browser/download/download_util.cc ('k') | chrome/browser/download/save_package.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698