wstring: make net::GetSuggestedFilename return utf-16

chrome/browser/download/download_util_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <locale.h>
 #endif
 
 #include "base/string_util.h"
 #include "chrome/browser/download/download_util.h"
@@ skipping 170 matching lines @@
    L"program.exe"},
 
   {"filename=../foo.txt",
    "http://www.evil.com/../foo.txt",
    "text/plain",
    L"foo.txt"},
 
   {"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",
    "http://www.evil.com/.hidden",
    "text/plain",
    L"hidden" TXT_EXT
   },
 
   {"filename=trailing.",
    "http://www.evil.com/trailing.",
@@ skipping 224 matching lines @@
 // Tests to ensure that the file names we generate from hints from the server
 // (content-disposition, URL name, etc) don't cause security holes.
 TEST(DownloadUtilTest, GenerateFileName) {
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   // This test doesn't run when the locale is not UTF-8 because some of the
   // string conversions fail. This is OK (we have the default value) but they
   // don't match our expectations.
   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) {
     FilePath generated_name;
     download_util::GenerateFileName(GURL(kGenerateFileNameTestCases[i].url),
                                     kGenerateFileNameTestCases[i].disposition,
                                     "",
                                     kGenerateFileNameTestCases[i].mime_type,
                                     &generated_name);
     EXPECT_EQ(kGenerateFileNameTestCases[i].expected_name,
@@ skipping 111 matching lines @@
 TEST(DownloadUtilTest, GenerateSafeFileName) {
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kSafeFilenameCases); ++i) {
     FilePath path(kSafeFilenameCases[i].path);
     download_util::GenerateSafeFileName(kSafeFilenameCases[i].mime_type, &path);
     EXPECT_EQ(kSafeFilenameCases[i].expected_path, path.value()) << i;
   }
 }
 
 }  // namespace