Do some cleanup of file path name handling.

net/base/net_util_unittest.cc

 // Copyright (c) 2006-2008 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.
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
@@ skipping 335 matching lines @@
 
 struct RFC1738Case {
   const char* host;
   bool expected_output;
 };
 
 struct SuggestedFilenameCase {
   const char* url;
   const char* content_disp_header;
   const char* referrer_charset;
-  const wchar_t* default_filename;
+  const char* default_filename;
   const wchar_t* expected_filename;
 };
 
 struct UrlTestData {
   const char* description;
   const char* input;
   const std::wstring languages;
   bool omit;
   UnescapeRule::Type escape_rules;
   const std::wstring output;
@@ skipping 396 matching lines @@
      "", L""},
     {"Content-Disposition: attachment; filename=%EC%98%88%EC%88%A", "", L""},
     // %-escaped non-UTF-8 encoding is an "error"
     {"Content-Disposition: attachment; filename=%B7%DD%BD%D1.png", "", L""},
     // Two RFC 2047 encoded words in a row without a space is an error.
     {"Content-Disposition: attachment; filename==?windows-1252?Q?caf=E3?="
      "=?iso-8859-7?b?4eIucG5nCg==?=", "", L""},
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     EXPECT_EQ(tests[i].expected,
-              net::GetFileNameFromCD(tests[i].header_field,
-                                     tests[i].referrer_charset));
+              UTF8ToWide(net::GetFileNameFromCD(tests[i].header_field,
+                                                tests[i].referrer_charset)));
   }
 }
 
 TEST(NetUtilTest, IDNToUnicodeFast) {
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(idn_cases); i++) {
     for (size_t j = 0; j < arraysize(kLanguages); j++) {
       // ja || zh-TW,en || ko,ja -> IDNToUnicodeSlow
       if (j == 3 || j == 17 || j == 18)
         continue;
       std::wstring output;
@@ skipping 61 matching lines @@
   EXPECT_EQ(L"", net::StripWWW(L"www."));
   EXPECT_EQ(L"blah", net::StripWWW(L"www.blah"));
   EXPECT_EQ(L"blah", net::StripWWW(L"blah"));
 }
 
 TEST(NetUtilTest, GetSuggestedFilename) {
   const SuggestedFilenameCase test_cases[] = {
     {"http://www.google.com/",
      "Content-disposition: attachment; filename=test.html",
      "",
-     L"",
+     "",
      L"test.html"},
     {"http://www.google.com/",
      "Content-disposition: attachment; filename=\"test.html\"",
      "",
-     L"",
+     "",
      L"test.html"},
     {"http://www.google.com/path/test.html",
      "Content-disposition: attachment",
      "",
-     L"",
+     "",
      L"test.html"},
     {"http://www.google.com/path/test.html",
      "Content-disposition: attachment;",
      "",
-     L"",
+     "",
      L"test.html"},
     {"http://www.google.com/",
      "",
      "",
-     L"",
+     "",
      L"www.google.com"},
     {"http://www.google.com/test.html",
      "",
      "",
-     L"",
+     "",
      L"test.html"},
     // Now that we use googleurl's ExtractFileName, this case falls back
     // to the hostname. If this behavior is not desirable, we'd better
     // change ExtractFileName (in url_parse).
     {"http://www.google.com/path/",
      "",
      "",
-     L"",
+     "",
      L"www.google.com"},
     {"http://www.google.com/path",
      "",
      "",
-     L"",
+     "",
      L"path"},
     {"file:///",
      "",
      "",
-     L"",
+     "",
      L"download"},
     {"non-standard-scheme:",
      "",
      "",
-     L"",
+     "",
      L"download"},
     {"http://www.google.com/",
      "Content-disposition: attachment; filename =\"test.html\"",
      "",
-     L"download",
+     "download",
      L"test.html"},
     {"http://www.google.com/",
      "",
      "",
-     L"download",
+     "download",
      L"download"},
     {"http://www.google.com/",
      "Content-disposition: attachment; filename=\"../test.html\"",
      "",
-     L"",
+     "",
      L"test.html"},
     {"http://www.google.com/",
      "Content-disposition: attachment; filename=\"..\"",
      "",
-     L"download",
+     "download",
      L"download"},
     {"http://www.google.com/test.html",
      "Content-disposition: attachment; filename=\"..\"",
      "",
-     L"download",
+     "download",
      L"test.html"},
     // Below is a small subset of cases taken from GetFileNameFromCD test above.
     {"http://www.google.com/",
      "Content-Disposition: attachment; filename=\"%EC%98%88%EC%88%A0%20"
      "%EC%98%88%EC%88%A0.jpg\"",
      "",
-     L"",
+     "",
      L"\uc608\uc220 \uc608\uc220.jpg"},
     {"http://www.google.com/%EC%98%88%EC%88%A0%20%EC%98%88%EC%88%A0.jpg",
      "",
      "",
-     L"download",
+     "download",
      L"\uc608\uc220 \uc608\uc220.jpg"},
     {"http://www.google.com/",
      "Content-disposition: attachment;",
      "",
-     L"\uB2E4\uC6B4\uB85C\uB4DC",
+     "\xEB\x8B\xA4\xEC\x9A\xB4\xEB\xA1\x9C\xEB\x93\x9C",
      L"\uB2E4\uC6B4\uB85C\uB4DC"},
     {"http://www.google.com/",
      "Content-Disposition: attachment; filename=\"=?EUC-JP?Q?=B7=DD=BD="
      "D13=2Epng?=\"",
      "",
-     L"download",
+     "download",
      L"\u82b8\u88533.png"},
     {"http://www.example.com/images?id=3",
      "Content-Disposition: attachment; filename=caf\xc3\xa9.png",
      "iso-8859-1",
-     L"",
+     "",
      L"caf\u00e9.png"},
     {"http://www.example.com/images?id=3",
      "Content-Disposition: attachment; filename=caf\xe5.png",
      "windows-1253",
-     L"",
+     "",
      L"caf\u03b5.png"},
     {"http://www.example.com/file?id=3",
      "Content-Disposition: attachment; name=\xcf\xc2\xd4\xd8.zip",
      "GBK",
-     L"",
+     "",
      L"\u4e0b\u8f7d.zip"},
     // Invalid C-D header. Extracts filename from url.
     {"http://www.google.com/test.html",
      "Content-Disposition: attachment; filename==?iiso88591?Q?caf=EG?=",
      "",
-     L"",
+     "",
      L"test.html"},
     // about: and data: URLs
     {"about:chrome",
      "",
      "",
-     L"",
+     "",
      L"download"},
     {"data:,looks/like/a.path",
      "",
      "",
-     L"",
+     "",
      L"download"},
     {"data:text/plain;base64,VG8gYmUgb3Igbm90IHRvIGJlLg=",
      "",
      "",
-     L"",
+     "",
      L"download"},
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
-    std::wstring filename = net::GetSuggestedFilename(
+    FilePath filename = net::GetSuggestedFilename(
         GURL(test_cases[i].url), test_cases[i].content_disp_header,
         test_cases[i].referrer_charset, test_cases[i].default_filename);
-    EXPECT_EQ(std::wstring(test_cases[i].expected_filename), filename);
+#if defined(OS_WIN)
+    EXPECT_EQ(std::wstring(test_cases[i].expected_filename), filename.value())
+#else
+    EXPECT_EQ(WideToUTF8(test_cases[i].expected_filename), filename.value())
+#endif
+      << "Iteration " << i << ": " << test_cases[i].url;
   }
 }
 
 // This is currently a windows specific function.
 #if defined(OS_WIN)
 namespace {
 
 struct GetDirectoryListingEntryCase {
   const wchar_t* name;
   const char* raw_bytes;
@@ skipping 427 matching lines @@
     net::SetExplicitlyAllowedPorts(invalid[i]);
     EXPECT_EQ(0, static_cast<int>(net::explicitly_allowed_ports.size()));
   }
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(valid); ++i) {
     net::SetExplicitlyAllowedPorts(valid[i]);
     EXPECT_EQ(i, net::explicitly_allowed_ports.size());
   }
 }