Get rid of kPathSeparator on windows.

net/base/net_util.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 <algorithm>
 #include <unicode/ucnv.h>
 #include <unicode/uidna.h>
 #include <unicode/ulocdata.h>
 #include <unicode/uniset.h>
 #include <unicode/uscript.h>
@@ skipping 31 matching lines @@
 #include "net/base/net_module.h"
 #include "net/base/net_resources.h"
 #include "net/base/base64.h"
 #include "unicode/datefmt.h"
 
 using base::Time;
 
 namespace {
 
 // what we prepend to get a file URL
-static const wchar_t kFileURLPrefix[] = L"file:///";
+static const FilePath::CharType kFileURLPrefix[] =
+    FILE_PATH_LITERAL("file:///");
 
 // The general list of blocked ports. Will be blocked unless a specific
 // protocol overrides it. (Ex: ftp can use ports 20 and 21)
 static const int kRestrictedPorts[] = {
   1,    // tcpmux
   7,    // echo
   9,    // discard
   11,   // systat
   13,   // daytime
   15,   // netstat
@@ skipping 568 matching lines @@
   // with the literal input.
   out->resize(host_begin_in_output + comp_len);
   for (int i = 0; i < comp_len; i++)
     (*out)[host_begin_in_output + i] = comp[i];
 }
 
 }  // namespace
 
 namespace net {
 
-GURL FilePathToFileURL(const std::wstring& file_path) {
+GURL FilePathToFileURL(const FilePath& path) {
   // Produce a URL like "file:///C:/foo" for a regular file, or
   // "file://///server/path" for UNC. The URL canonicalizer will fix up the
   // latter case to be the canonical UNC form: "file://server/path"
-  std::wstring url_str(kFileURLPrefix);
-  url_str.append(file_path);
+  FilePath::StringType url_string(kFileURLPrefix);
+  url_string.append(path.value());
 
   // Now do replacement of some characters. Since we assume the input is a
   // literal filename, anything the URL parser might consider special should
   // be escaped here.
 
   // must be the first substitution since others will introduce percents as the
   // escape character
-  ReplaceSubstringsAfterOffset(&url_str, 0, L"%", L"%25");
+  ReplaceSubstringsAfterOffset(&url_string, 0,
+      FILE_PATH_LITERAL("%"), FILE_PATH_LITERAL("%25"));
 
   // semicolon is supposed to be some kind of separator according to RFC 2396
-  ReplaceSubstringsAfterOffset(&url_str, 0, L";", L"%3B");
+  ReplaceSubstringsAfterOffset(&url_string, 0,
+      FILE_PATH_LITERAL(";"), FILE_PATH_LITERAL("%3B"));
 
-  ReplaceSubstringsAfterOffset(&url_str, 0, L"#", L"%23");
+  ReplaceSubstringsAfterOffset(&url_string, 0,
+      FILE_PATH_LITERAL("#"), FILE_PATH_LITERAL("%23"));
 
-#if defined(WCHAR_T_IS_UTF32)
-  return GURL(WideToUTF8(url_str));
-#else
-  return GURL(url_str);
-#endif
+  return GURL(url_string);
+}
+
+GURL FilePathToFileURL(const std::wstring& path_str) {
+  return FilePathToFileURL(FilePath::FromWStringHack(path_str));
 }
 
 std::wstring GetSpecificHeader(const std::wstring& headers,
                                const std::wstring& name) {
   return GetSpecificHeaderT(headers, name);
 }
 
 std::string GetSpecificHeader(const std::string& headers,
                                const std::string& name) {
   return GetSpecificHeaderT(headers, name);
@@ skipping 269 matching lines @@
 
 // Deprecated.
 bool FileURLToFilePath(const GURL& gurl, std::wstring* file_path) {
   FilePath path;
   bool rv = FileURLToFilePath(gurl, &path);
   *file_path = path.ToWStringHack();
   return rv;
 }
 
 }  // namespace net