Do some cleanup of file path name handling.

chrome/browser/download/save_package.cc

 // 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.
 
 #include "chrome/browser/download/save_package.h"
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/logging.h"
@@ skipping 47 matching lines @@
   explicit SavePackageParam(const std::string& mime_type)
       : current_tab_mime_type(mime_type),
         save_type(SavePackage::SAVE_TYPE_UNKNOWN) {
   }
 };
 
 namespace {
 
 // Default name which will be used when we can not get proper name from
 // resource URL.
-const wchar_t kDefaultSaveName[] = L"saved_resource";
+const char kDefaultSaveName[] = "saved_resource";
 
 const FilePath::CharType kDefaultHtmlExtension[] =
 #if defined(OS_WIN)
     FILE_PATH_LITERAL("htm");
 #else
     FILE_PATH_LITERAL("html");
 #endif
 
 // Maximum number of file ordinal number. I think it's big enough for resolving
 // name-conflict files which has same base file name.
@@ skipping 250 matching lines @@
   return true;
 }
 
 // Generate name for saving resource.
 bool SavePackage::GenerateFilename(const std::string& disposition,
                                    const GURL& url,
                                    bool need_html_ext,
                                    FilePath::StringType* generated_name) {
   // TODO(jungshik): Figure out the referrer charset when having one
   // makes sense and pass it to GetSuggestedFilename.
-  FilePath file_path = FilePath::FromWStringHack(
-      net::GetSuggestedFilename(url, disposition, "", kDefaultSaveName));
+  FilePath file_path = net::GetSuggestedFilename(url, disposition, "",
+                                                 kDefaultSaveName);
 
   DCHECK(!file_path.empty());
   FilePath::StringType pure_file_name =
       file_path.RemoveExtension().BaseName().value();
   FilePath::StringType file_name_ext = file_path.Extension();
 
   // If it is HTML resource, use ".htm{l,}" as its extension.
   if (need_html_ext) {
     file_name_ext = FILE_PATH_LITERAL(".");
     file_name_ext.append(kDefaultHtmlExtension);
@@ skipping 675 matching lines @@
     }
     if (url_path.empty())
       url_path = url.host();
     name_with_proper_ext = FilePath::FromWStringHack(UTF8ToWide(url_path));
   }
 
   // Ask user for getting final saving name.
   if (can_save_as_complete)
     name_with_proper_ext = EnsureHtmlExtension(name_with_proper_ext);
 
-  std::wstring file_name = name_with_proper_ext.ToWStringHack();
-  // TODO(port): we need a version of ReplaceIllegalCharacters() that takes
-  // FilePaths.
-  file_util::ReplaceIllegalCharacters(&file_name, L' ');
-  TrimWhitespace(file_name, TRIM_ALL, &file_name);
-
-  return FilePath::FromWStringHack(file_name);
+  FilePath::StringType file_name = name_with_proper_ext.value();
+  file_util::ReplaceIllegalCharactersInPath(&file_name, ' ');
+  return FilePath(file_name);
 }
 
 FilePath SavePackage::EnsureHtmlExtension(const FilePath& name) {
   // If the file name doesn't have an extension suitable for HTML files,
   // append one.
   FilePath::StringType ext = file_util::GetFileExtensionFromPath(name);
   std::string mime_type;
   if (!net::GetMimeTypeFromExtension(ext, &mime_type) ||
       !CanSaveAsComplete(mime_type)) {
     return FilePath(name.value() + FILE_PATH_LITERAL(".") +
@@ skipping 198 matching lines @@
                                int index, void* params) {
   SavePackageParam* save_params = reinterpret_cast<SavePackageParam*>(params);
   ContinueSave(save_params, path, index);
   delete save_params;
 }
 
 void SavePackage::FileSelectionCanceled(void* params) {
   SavePackageParam* save_params = reinterpret_cast<SavePackageParam*>(params);
   delete save_params;
 }