wstring: make net::GetSuggestedFilename return utf-16

net/base/net_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.
 
 #include "net/base/net_util.h"
 
 #include "base/file_path.h"
 #include "base/format_macros.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 1196 matching lines @@
 #if 0
     {"http://example.com/V%FDvojov%E1%20psychologie.doc",
      "",
      "utf-8",
      L"",
      L"V\u00fdvojov\u00e1 psychologie.doc",
     },
 #endif
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
-#if defined(OS_WIN)
-    FilePath default_name(test_cases[i].default_filename);
-#else
-    FilePath default_name(
-        base::SysWideToNativeMB(test_cases[i].default_filename));
-#endif
-    FilePath filename = net::GetSuggestedFilename(
+    std::wstring default_name = test_cases[i].default_filename;
+    string16 filename = net::GetSuggestedFilename(
         GURL(test_cases[i].url), test_cases[i].content_disp_header,
-        test_cases[i].referrer_charset, default_name);
-#if defined(OS_WIN)
-    EXPECT_EQ(std::wstring(test_cases[i].expected_filename), filename.value())
-#else
-    EXPECT_EQ(base::SysWideToNativeMB(test_cases[i].expected_filename),
-              filename.value())
-#endif
+        test_cases[i].referrer_charset, WideToUTF16(default_name));
+    EXPECT_EQ(std::wstring(test_cases[i].expected_filename),
+              UTF16ToWide(filename))
       << "Iteration " << i << ": " << test_cases[i].url;
   }
 }
 
 // This is currently a windows specific function.
 #if defined(OS_WIN)
 namespace {
 
 struct GetDirectoryListingEntryCase {
   const wchar_t* name;
@@ skipping 920 matching lines @@
     EXPECT_TRUE(net::ParseCIDRBlock(tests[i].cidr_literal,
                                     &ip_prefix,
                                     &prefix_length_in_bits));
 
     EXPECT_EQ(tests[i].expected_to_match,
               net::IPNumberMatchesPrefix(ip_number,
                                          ip_prefix,
                                          prefix_length_in_bits));
   }
 }