[net] Cleanup filename_util and make it portable.

content/browser/download/save_package.cc

 // Copyright (c) 2012 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 "content/browser/download/save_package.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 1384 matching lines @@
 
 void SavePackage::OnPathPicked(
     const base::FilePath& final_name,
     SavePageType type,
     const SavePackageDownloadCreatedCallback& download_created_callback) {
   DCHECK((type == SAVE_PAGE_TYPE_AS_ONLY_HTML) ||
          (type == SAVE_PAGE_TYPE_AS_MHTML) ||
          (type == SAVE_PAGE_TYPE_AS_COMPLETE_HTML)) << type;
   // Ensure the filename is safe.
   saved_main_file_path_ = final_name;
-  // TODO(asanka): This call may block on IO and shouldn't be made
-  // from the UI thread.  See http://crbug.com/61827.
-  net::GenerateSafeFileName(web_contents()->GetContentsMimeType(), false,
-                            &saved_main_file_path_);
+  net::EnsureSafePortableFileName(std::string(),
+                                  net::EXTENSION_OPTION_KEEP_EXISTING,
+                                  &saved_main_file_path_);
 
   saved_main_directory_path_ = saved_main_file_path_.DirName();
   save_type_ = type;
   if (save_type_ == SAVE_PAGE_TYPE_AS_COMPLETE_HTML) {
     // Make new directory for saving complete file.
     saved_main_directory_path_ = saved_main_directory_path_.Append(
         saved_main_file_path_.RemoveExtension().BaseName().value() +
         FILE_PATH_LITERAL("_files"));
   }
 
@@ skipping 15 matching lines @@
 
 void SavePackage::FinalizeDownloadEntry() {
   DCHECK(download_);
   DCHECK(download_manager_);
 
   download_manager_->OnSavePackageSuccessfullyFinished(download_);
   StopObservation();
 }
 
 }  // namespace content