Do some cleanup of file path name handling.

app/os_exchange_data_provider_win.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 "app/os_exchange_data_provider_win.h"
 
 #include "app/clipboard/clipboard_util_win.h"
 #include "app/l10n_util.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/logging.h"
@@ skipping 685 matching lines @@
   static const std::string kInternetShortcutFileEnd =
       "\r\n";
   *data = kInternetShortcutFileStart + url.spec() + kInternetShortcutFileEnd;
 }
 
 static void CreateValidFileNameFromTitle(const GURL& url,
                                          const std::wstring& title,
                                          std::wstring* validated) {
   if (title.empty()) {
     if (url.is_valid()) {
-      *validated = net::GetSuggestedFilename(
-          url, std::string(), std::string(), std::wstring());
+      *validated = net::GetSuggestedFilename(url, std::string(),
+                                             std::string(), "").ToWStringHack();
     } else {
       // Nothing else can be done, just use a default.
       *validated = l10n_util::GetString(IDS_APP_UNTITLED_SHORTCUT_FILE_NAME);
     }
   } else {
     *validated = title;
-    file_util::ReplaceIllegalCharacters(validated, '-');
+    file_util::ReplaceIllegalCharactersInPath(validated, '-');
   }
   static const wchar_t extension[] = L".url";
   static const size_t max_length = MAX_PATH - arraysize(extension);
   if (validated->size() > max_length)
     validated->erase(max_length);
   *validated += extension;
 }
 
 static STGMEDIUM* GetStorageForFileDescriptor(
     const std::wstring& valid_file_name) {
@@ skipping 23 matching lines @@
 // static
 OSExchangeData::Provider* OSExchangeData::CreateProvider() {
   return new OSExchangeDataProviderWin();
 }
 
 // static
 OSExchangeData::CustomFormat OSExchangeData::RegisterCustomFormat(
     const std::string& type) {
   return RegisterClipboardFormat(ASCIIToWide(type).c_str());
 }