[net] Cleanup filename_util and make it portable.

ui/base/dragdrop/os_exchange_data_provider_win.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 "ui/base/dragdrop/os_exchange_data_provider_win.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
@@ skipping 398 matching lines @@
     GURL* url,
     base::string16* title) const {
   base::string16 url_str;
   bool success = ClipboardUtil::GetUrl(
       source_object_.get(), url, title,
       policy == OSExchangeData::CONVERT_FILENAMES ? true : false);
   if (success) {
     DCHECK(url->is_valid());
     return true;
   } else if (GetPlainTextURL(source_object_.get(), url)) {
-    if (url->is_valid())
-      *title = net::GetSuggestedFilename(*url, "", "", "", "", std::string());
-    else
+    if (url->is_valid()) {
+      *title = net::GenerateFileName(*url, std::string(), std::string(),
+                                     std::string(), std::string(),
+                                     std::string()).AsUTF16Unsafe();
+    } else {
       title->clear();
+    }
     return true;
   }
   return false;
 }
 
 bool OSExchangeDataProviderWin::GetFilename(base::FilePath* path) const {
   std::vector<base::string16> filenames;
   bool success = ClipboardUtil::GetFilenames(source_object_.get(), &filenames);
   if (success)
     *path = base::FilePath(filenames[0]);
@@ skipping 467 matching lines @@
   static const std::string kInternetShortcutFileEnd =
       "\r\n";
   *data = kInternetShortcutFileStart + url.spec() + kInternetShortcutFileEnd;
 }
 
 static void CreateValidFileNameFromTitle(const GURL& url,
                                          const base::string16& title,
                                          base::string16* validated) {
   if (title.empty()) {
     if (url.is_valid()) {
-      *validated = net::GetSuggestedFilename(url, "", "", "", "",
-                                             std::string());
+      *validated = net::GenerateFileName(url, std::string(), std::string(),
+                                         std::string(), std::string(),
+                                         std::string()).AsUTF16Unsafe();
     } else {
       // Nothing else can be done, just use a default.
       *validated =
           l10n_util::GetStringUTF16(IDS_APP_UNTITLED_SHORTCUT_FILE_NAME);
     }
   } else {
     *validated = title;
     base::i18n::ReplaceIllegalCharactersInPath(validated, '-');
   }
   static const wchar_t extension[] = L".url";
@@ skipping 125 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // OSExchangeData, public:
 
 // static
 OSExchangeData::Provider* OSExchangeData::CreateProvider() {
   return new OSExchangeDataProviderWin();
 }
 
 }  // namespace ui