Monster FilePath patch!

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/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include <ws2tcpip.h>
 #else
 #include <netdb.h>
 #endif
 
 namespace {
 
 class NetUtilTest : public testing::Test {
 };
 
 struct FileCase {
   const wchar_t* file;
-  const wchar_t* url;
+  const char* url;
 };
 
 struct HeaderCase {
   const wchar_t* header_name;
   const wchar_t* expected;
 };
 
 struct HeaderParamCase {
   const wchar_t* header_name;
   const wchar_t* param_name;
@@ skipping 71 matching lines @@
   ai->ai_addr = (sockaddr*)addr6;
   return ai;
 }
 
 }  // anonymous namespace
 
 TEST(NetUtilTest, FileURLConversion) {
   // a list of test file names and the corresponding URLs
   const FileCase round_trip_cases[] = {
 #if defined(OS_WIN)
-    {L"C:\\foo\\bar.txt", L"file:///C:/foo/bar.txt"},
+    {L"C:\\foo\\bar.txt", "file:///C:/foo/bar.txt"},
     {L"\\\\some computer\\foo\\bar.txt",
-     L"file://some%20computer/foo/bar.txt"}, // UNC
+     "file://some%20computer/foo/bar.txt"}, // UNC
     {L"D:\\Name;with%some symbols*#",
-     L"file:///D:/Name%3Bwith%25some%20symbols*%23"},
+     "file:///D:/Name%3Bwith%25some%20symbols*%23"},
     {L"D:\\Chinese\\\x6240\x6709\x4e2d\x6587\x7f51\x9875.doc",
-     L"file:///D:/Chinese/%E6%89%80%E6%9C%89%E4%B8%AD%E6%96%87%E7%BD%91"
-         L"%E9%A1%B5.doc"},
+     "file:///D:/Chinese/%E6%89%80%E6%9C%89%E4%B8%AD%E6%96%87%E7%BD%91"
+         "%E9%A1%B5.doc"},
 #elif defined(OS_POSIX)
-    {L"/foo/bar.txt", L"file:///foo/bar.txt"},
-    {L"/foo/BAR.txt", L"file:///foo/BAR.txt"},
-    {L"/C:/foo/bar.txt", L"file:///C:/foo/bar.txt"},
-    {L"/some computer/foo/bar.txt", L"file:///some%20computer/foo/bar.txt"},
-    {L"/Name;with%some symbols*#", L"file:///Name%3Bwith%25some%20symbols*%23"},
+    {L"/foo/bar.txt", "file:///foo/bar.txt"},
+    {L"/foo/BAR.txt", "file:///foo/BAR.txt"},
+    {L"/C:/foo/bar.txt", "file:///C:/foo/bar.txt"},
+    {L"/some computer/foo/bar.txt", "file:///some%20computer/foo/bar.txt"},
+    {L"/Name;with%some symbols*#", "file:///Name%3Bwith%25some%20symbols*%23"},
     {L"/Chinese/\x6240\x6709\x4e2d\x6587\x7f51\x9875.doc",
-     L"file:///Chinese/%E6%89%80%E6%9C%89%E4%B8%AD%E6%96%87%E7%BD"
-         L"%91%E9%A1%B5.doc"},
+     "file:///Chinese/%E6%89%80%E6%9C%89%E4%B8%AD%E6%96%87%E7%BD"
+         "%91%E9%A1%B5.doc"},
 #endif
   };
 
   // First, we'll test that we can round-trip all of the above cases of URLs
-  std::wstring output;
+  FilePath output;
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(round_trip_cases); i++) {
     // convert to the file URL
-    GURL file_url(net::FilePathToFileURL(round_trip_cases[i].file));
-    EXPECT_EQ(std::wstring(round_trip_cases[i].url),
-              UTF8ToWide(file_url.spec()));
+    GURL file_url(net::FilePathToFileURL(
+        FilePath::FromWStringHack(round_trip_cases[i].file)));
+    EXPECT_EQ(round_trip_cases[i].url, file_url.spec());
 
     // Back to the filename.
     EXPECT_TRUE(net::FileURLToFilePath(file_url, &output));
-    EXPECT_EQ(std::wstring(round_trip_cases[i].file), output);
+    EXPECT_EQ(round_trip_cases[i].file, output.ToWStringHack());
   }
 
   // Test that various file: URLs get decoded into the correct file type
   FileCase url_cases[] = {
 #if defined(OS_WIN)
-    {L"C:\\foo\\bar.txt", L"file:c|/foo\\bar.txt"},
-    {L"C:\\foo\\bar.txt", L"file:/c:/foo/bar.txt"},
-    {L"\\\\foo\\bar.txt", L"file://foo\\bar.txt"},
-    {L"C:\\foo\\bar.txt", L"file:///c:/foo/bar.txt"},
-    {L"\\\\foo\\bar.txt", L"file:////foo\\bar.txt"},
-    {L"\\\\foo\\bar.txt", L"file:/foo/bar.txt"},
-    {L"\\\\foo\\bar.txt", L"file://foo\\bar.txt"},
-    {L"C:\\foo\\bar.txt", L"file:\\\\\\c:/foo/bar.txt"},
+    {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"},
+    {L"\\\\foo\\bar.txt", "file:/foo/bar.txt"},
+    {L"\\\\foo\\bar.txt", "file://foo\\bar.txt"},
+    {L"C:\\foo\\bar.txt", "file:\\\\\\c:/foo/bar.txt"},
 #elif defined(OS_POSIX)
-    {L"/c:/foo/bar.txt", L"file:/c:/foo/bar.txt"},
-    {L"/c:/foo/bar.txt", L"file:///c:/foo/bar.txt"},
-    {L"/foo/bar.txt", L"file:/foo/bar.txt"},
-    {L"/c:/foo/bar.txt", L"file:\\\\\\c:/foo/bar.txt"},
-    {L"/foo/bar.txt", L"file:foo/bar.txt"},
-    {L"/bar.txt", L"file://foo/bar.txt"},
-    {L"/foo/bar.txt", L"file:///foo/bar.txt"},
-    {L"/foo/bar.txt", L"file:////foo/bar.txt"},
-    {L"/foo/bar.txt", L"file:////foo//bar.txt"},
-    {L"/foo/bar.txt", L"file:////foo///bar.txt"},
-    {L"/foo/bar.txt", L"file:////foo////bar.txt"},
-    {L"/c:/foo/bar.txt", L"file:\\\\\\c:/foo/bar.txt"},
-    {L"/c:/foo/bar.txt", L"file:c:/foo/bar.txt"},
+    {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"},
+    {L"/bar.txt", "file://foo/bar.txt"},
+    {L"/foo/bar.txt", "file:///foo/bar.txt"},
+    {L"/foo/bar.txt", "file:////foo/bar.txt"},
+    {L"/foo/bar.txt", "file:////foo//bar.txt"},
+    {L"/foo/bar.txt", "file:////foo///bar.txt"},
+    {L"/foo/bar.txt", "file:////foo////bar.txt"},
+    {L"/c:/foo/bar.txt", "file:\\\\\\c:/foo/bar.txt"},
+    {L"/c:/foo/bar.txt", "file:c:/foo/bar.txt"},
     // We get these wrong because GURL turns back slashes into forward
     // slashes.
-    //{L"/foo%5Cbar.txt", L"file://foo\\bar.txt"},
-    //{L"/c|/foo%5Cbar.txt", L"file:c|/foo\\bar.txt"},
-    //{L"/foo%5Cbar.txt", L"file://foo\\bar.txt"},
-    //{L"/foo%5Cbar.txt", L"file:////foo\\bar.txt"},
-    //{L"/foo%5Cbar.txt", L"file://foo\\bar.txt"},
+    //{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++) {
-    net::FileURLToFilePath(GURL(WideToUTF8(url_cases[i].url)), &output);
-    EXPECT_EQ(std::wstring(url_cases[i].file), output);
+    net::FileURLToFilePath(GURL(url_cases[i].url), &output);
+    EXPECT_EQ(url_cases[i].file, output.ToWStringHack());
   }
 
   // Here, we test that UTF-8 encoded strings get decoded properly, even when
   // they might be stored with wide characters.  On posix systems, just treat
   // this as a stream of bytes.
   const wchar_t utf8[] = L"file:///d:/Chinese/\xe6\x89\x80\xe6\x9c\x89\xe4\xb8"
                          L"\xad\xe6\x96\x87\xe7\xbd\x91\xe9\xa1\xb5.doc";
 #if defined(OS_WIN)
   const wchar_t wide[] =
       L"D:\\Chinese\\\x6240\x6709\x4e2d\x6587\x7f51\x9875.doc";
 #elif defined(OS_POSIX)
   const wchar_t wide[] = L"/d:/Chinese/\xe6\x89\x80\xe6\x9c\x89\xe4\xb8\xad\xe6"
                          L"\x96\x87\xe7\xbd\x91\xe9\xa1\xb5.doc";
 #endif
   EXPECT_TRUE(net::FileURLToFilePath(GURL(WideToUTF8(utf8)), &output));
-  EXPECT_EQ(std::wstring(wide), output);
+  EXPECT_EQ(wide, output.ToWStringHack());
 
   // 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(net::FileURLToFilePath(
       GURL(std::string(invalid_utf8)), &output));
   EXPECT_EQ(std::wstring(invalid_wide), output);
@@ skipping 670 matching lines @@
   }
 }
 
 TEST(NetUtilTest, GetHostName) {
   // We can't check the result of GetHostName() directly, since the result
   // will differ across machines. Our goal here is to simply exercise the
   // code path, and check that things "look about right".
   std::string hostname = net::GetHostName();
   EXPECT_FALSE(hostname.empty());
 }