Do some cleanup of file path name handling.

chrome/browser/shell_integration_linux.cc

 // Copyright (c) 2006-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/shell_integration.h"
 
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ skipping 285 matching lines @@
   argv.push_back("default-web-browser");
 
   std::string browser;
   // We don't care about the return value here.
   base::GetAppOutput(CommandLine(argv), &browser);
   return browser.find("irefox") != std::string::npos;
 }
 
 FilePath ShellIntegration::GetDesktopShortcutFilename(const GURL& url) {
   // Use a prefix, because xdg-desktop-menu requires it.
-  std::wstring filename_wide =
-      std::wstring(chrome::kBrowserProcessExecutableName) + L"-" +
-      UTF8ToWide(url.spec());
-  file_util::ReplaceIllegalCharacters(&filename_wide, '_');
+  std::string filename =
+      WideToUTF8(chrome::kBrowserProcessExecutableName) + "-" + url.spec();
+  file_util::ReplaceIllegalCharactersInPath(&filename, '_');
 
   FilePath desktop_path;
   if (!PathService::Get(chrome::DIR_USER_DESKTOP, &desktop_path))
     return FilePath();
 
-  FilePath filepath = desktop_path.Append(
-      FilePath::FromWStringHack(filename_wide));
+  FilePath filepath = desktop_path.Append(filename);
   FilePath alternative_filepath(filepath.value() + ".desktop");
   for (size_t i = 1; i < 100; ++i) {
     if (file_util::PathExists(FilePath(alternative_filepath))) {
       alternative_filepath = FilePath(filepath.value() + "_" + IntToString(i) +
                                       ".desktop");
     } else {
       return FilePath(alternative_filepath).BaseName();
     }
   }
 
@@ skipping 43 matching lines @@
     }
   }
   return output_buffer;
 }
 
 void ShellIntegration::CreateDesktopShortcut(
     const ShortcutInfo& shortcut_info) {
   g_browser_process->file_thread()->message_loop()->PostTask(FROM_HERE,
       new CreateDesktopShortcutTask(shortcut_info));
 }