Do some cleanup of file path name handling.

net/base/net_util.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
-#ifndef NET_BASE_NET_UTIL_H__
-#define NET_BASE_NET_UTIL_H__
+#ifndef NET_BASE_NET_UTIL_H_
+#define NET_BASE_NET_UTIL_H_
 
 #include "build/build_config.h"
 
 #ifdef OS_WIN
 #include <windows.h>
 #endif
 
 #include <string>
 #include <set>
 
@@ skipping 102 matching lines @@
 // another means to get a filename (e.g. url).
 //
 // This function does not do any escaping and callers are responsible for
 // escaping 'unsafe' characters (e.g. (back)slash, colon) as they see fit.
 //
 // TODO(jungshik): revisit this issue. At the moment, the only caller
 // net_util::GetSuggestedFilename and it calls ReplaceIllegalCharacters.  The
 // other caller is a unit test. Need to figure out expose this function only to
 // net_util_unittest.
 //
-std::wstring GetFileNameFromCD(const std::string& header,
-                               const std::string& referrer_charset);
+std::string GetFileNameFromCD(const std::string& header,
+                              const std::string& referrer_charset);
 
 // Converts the given host name to unicode characters, APPENDING them to the
 // the given output string. This can be called for any host name, if the
 // input is not IDN or is invalid in some way, we'll just append the ASCII
 // source to the output so it is still usable.
 //
 // The input should be the canonicalized ASCII host name from GURL. This
 // function does NOT accept UTF-8! Its length must also be given (this is
 // designed to work on the substring of the host out of a URL spec).
 //
@@ skipping 46 matching lines @@
                                      const std::string& raw_bytes,
                                      bool is_dir, int64 size,
                                      base::Time modified);
 
 // If text starts with "www." it is removed, otherwise text is returned
 // unmodified.
 std::wstring StripWWW(const std::wstring& text);
 
 // Gets the filename from the raw Content-Disposition header (as read from the
 // network).  Otherwise uses the last path component name or hostname from
-// |url|.  Note: it's possible for the suggested filename to be empty (e.g.,
+// |url|. If there is no filename or it can't be used, the given default name
+// will be used if specified.
+
+// Note: it's possible for the suggested filename to be empty (e.g.,
 // file:///). referrer_charset is used as one of charsets
 // to interpret a raw 8bit string in C-D header (after interpreting
 // as UTF-8 fails). See the comment for GetFilenameFromCD for more details.
-std::wstring GetSuggestedFilename(const GURL& url,
-                                  const std::string& content_disposition,
-                                  const std::string& referrer_charset,
-                                  const std::wstring& default_name);
+FilePath GetSuggestedFilename(const GURL& url,
+                              const std::string& content_disposition,
+                              const std::string& referrer_charset,
+                              const char* default_name);
 
 // Checks the given port against a list of ports which are restricted by
 // default.  Returns true if the port is allowed, false if it is restricted.
 bool IsPortAllowedByDefault(int port);
 
 // Checks the given port against a list of ports which are restricted by the
 // FTP protocol.  Returns true if the port is allowed, false if it is
 // restricted.
 bool IsPortAllowedByFtp(int port);
 
@@ skipping 37 matching lines @@
 
 // Strip the portions of |url| that aren't core to the network request.
 //   - user name / password
 //   - reference section
 GURL SimplifyUrlForRequest(const GURL& url);
 
 void SetExplicitlyAllowedPorts(const std::wstring& allowed_ports);
 
 }  // namespace net
 
-#endif  // NET_BASE_NET_UTIL_H__
+#endif  // NET_BASE_NET_UTIL_H_