Do some cleanup of file path name handling.

chrome/browser/views/tab_contents/tab_contents_view_win.cc

 // Copyright (c) 2006-2008 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/views/tab_contents/tab_contents_view_win.h"
 
 #include <windows.h>
 
 #include "app/gfx/canvas_paint.h"
 #include "app/os_exchange_data.h"
@@ skipping 120 matching lines @@
   // We set the file contents before the URL because the URL also sets file
   // contents (to a .URL shortcut).  We want to prefer file content data over a
   // shortcut so we add it first.
   if (!drop_data.file_contents.empty()) {
     // Images without ALT text will only have a file extension so we need to
     // synthesize one from the provided extension and URL.
     FilePath file_name(drop_data.file_description_filename);
     file_name = file_name.BaseName().RemoveExtension();
     if (file_name.value().empty()) {
       // Retrieve the name from the URL.
-      std::wstring fn = net::GetSuggestedFilename(drop_data.url, "", "", L"");
-      if ((fn.size() + drop_data.file_extension.size() + 1) > MAX_PATH)
-        fn = fn.substr(0, MAX_PATH - drop_data.file_extension.size() - 2);
-      file_name = FilePath::FromWStringHack(fn);
+      file_name = net::GetSuggestedFilename(drop_data.url, "", "", "");
+      if (file_name.value().size() + drop_data.file_extension.size() + 1 >
+          MAX_PATH) {
+        file_name = FilePath(file_name.value().substr(
+            0, MAX_PATH - drop_data.file_extension.size() - 2));
+      }
     }
     file_name = file_name.ReplaceExtension(drop_data.file_extension);
     data.SetFileContents(file_name.value(), drop_data.file_contents);
   }
   if (!drop_data.text_html.empty())
     data.SetHtml(drop_data.text_html, drop_data.html_base_url);
   if (drop_data.url.is_valid()) {
     if (drop_data.url.SchemeIs(chrome::kJavaScriptScheme)) {
       // We don't want to allow javascript URLs to be dragged to the desktop,
       // but we do want to allow them to be added to the bookmarks bar
@@ skipping 491 matching lines @@
   }
   return false;
 }
 
 void TabContentsViewWin::WheelZoom(int distance) {
   if (tab_contents()->delegate()) {
     bool zoom_in = distance > 0;
     tab_contents()->delegate()->ContentsZoomChange(zoom_in);
   }
 }