Remove wstring file path helpers from test_file_util.

net/base/filename_util_unittest.cc

 // Copyright 2014 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/filename_util.h"
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 14 matching lines @@
   int lineno;
   const char* url;
   const char* content_disp_header;
   const char* referrer_charset;
   const char* suggested_filename;
   const char* mime_type;
   const wchar_t* default_filename;
   const wchar_t* expected_filename;
 };
 
+// The expected filenames are coded as wchar_t for convenience.
+std::wstring FilePathAsWString(const base::FilePath& path) {
+#if defined(OS_WIN)
+  return path.value();
+#else
+  return base::UTF8ToWide(path.value());
+#endif
+}
+base::FilePath WStringAsFilePath(const std::wstring& str) {
+#if defined(OS_WIN)
+  return base::FilePath(str);
+#else
+  return base::FilePath(base::WideToUTF8(str));
+#endif
+}
+
 void RunGenerateFileNameTestCase(const GenerateFilenameCase* test_case) {
   std::string default_filename(base::WideToUTF8(test_case->default_filename));
   base::FilePath file_path = GenerateFileName(
       GURL(test_case->url), test_case->content_disp_header,
       test_case->referrer_charset, test_case->suggested_filename,
       test_case->mime_type, default_filename);
-  EXPECT_EQ(test_case->expected_filename,
-            file_util::FilePathAsWString(file_path))
+  EXPECT_EQ(test_case->expected_filename, FilePathAsWString(file_path))
       << "test case at line number: " << test_case->lineno;
 }
 
 }  // namespace
 
 static const base::FilePath::CharType* kSafePortableBasenames[] = {
   FILE_PATH_LITERAL("a"),
   FILE_PATH_LITERAL("a.txt"),
   FILE_PATH_LITERAL("a b.txt"),
   FILE_PATH_LITERAL("a-b.txt"),
@@ skipping 111 matching lines @@
     {L"/plane1/\x1D400\x1D401.txt",  // Math alphabet "AB"
      "file:///plane1/%F0%9D%90%80%F0%9D%90%81.txt"},
 #endif
   };
 
   // First, we'll test that we can round-trip all of the above cases of URLs
   base::FilePath output;
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(round_trip_cases); i++) {
     // convert to the file URL
     GURL file_url(FilePathToFileURL(
-                      file_util::WStringAsFilePath(round_trip_cases[i].file)));
+                      WStringAsFilePath(round_trip_cases[i].file)));
     EXPECT_EQ(round_trip_cases[i].url, file_url.spec());
 
     // Back to the filename.
     EXPECT_TRUE(FileURLToFilePath(file_url, &output));
-    EXPECT_EQ(round_trip_cases[i].file, file_util::FilePathAsWString(output));
+    EXPECT_EQ(round_trip_cases[i].file, FilePathAsWString(output));
   }
 
   // Test that various file: URLs get decoded into the correct file type
   FileCase url_cases[] = {
 #if defined(OS_WIN)
     {L"C:\\foo\\bar.txt", "file:c|/foo\\bar.txt"},
     {L"C:\\foo\\bar.txt", "file:/c:/foo/bar.txt"},
     {L"\\\\foo\\bar.txt", "file://foo\\bar.txt"},
     {L"C:\\foo\\bar.txt", "file:///c:/foo/bar.txt"},
     {L"\\\\foo\\bar.txt", "file:////foo\\bar.txt"},
@@ skipping 18 matching lines @@
     // slashes.
     //{L"/foo%5Cbar.txt", "file://foo\\bar.txt"},
     //{L"/c|/foo%5Cbar.txt", "file:c|/foo\\bar.txt"},
     //{L"/foo%5Cbar.txt", "file://foo\\bar.txt"},
     //{L"/foo%5Cbar.txt", "file:////foo\\bar.txt"},
     //{L"/foo%5Cbar.txt", "file://foo\\bar.txt"},
 #endif
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(url_cases); i++) {
     FileURLToFilePath(GURL(url_cases[i].url), &output);
-    EXPECT_EQ(url_cases[i].file, file_util::FilePathAsWString(output));
+    EXPECT_EQ(url_cases[i].file, FilePathAsWString(output));
   }
 
   // Unfortunately, UTF8ToWide discards invalid UTF8 input.
 #ifdef BUG_878908_IS_FIXED
   // Test that no conversion happens if the UTF-8 input is invalid, and that
   // the input is preserved in UTF-8
   const char invalid_utf8[] = "file:///d:/Blah/\xff.doc";
   const wchar_t invalid_wide[] = L"D:\\Blah\\\xff.doc";
   EXPECT_TRUE(FileURLToFilePath(
       GURL(std::string(invalid_utf8)), &output));
@@ skipping 1414 matching lines @@
     RunGenerateFileNameTestCase(&generation_tests[i]);
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(generation_tests); ++i) {
     GenerateFilenameCase test_case = generation_tests[i];
     test_case.referrer_charset = "GBK";
     RunGenerateFileNameTestCase(&test_case);
   }
 }
 
 }  // namespace net