Do some cleanup of file path name handling.

webkit/glue/weburlloader_impl.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.
 
 // An implementation of WebURLLoader in terms of ResourceLoaderBridge.
 
 #include "webkit/glue/weburlloader_impl.h"
 
 #include "base/message_loop.h"
 #include "base/process_util.h"
@@ skipping 149 matching lines @@
 
   response->setHTTPStatusCode(headers->response_code());
   response->setHTTPStatusText(StdStringToWebString(headers->GetStatusText()));
 
   // TODO(darin): We should leverage HttpResponseHeaders for this, and this
   // should be using the same code as ResourceDispatcherHost.
   // TODO(jungshik): Figure out the actual value of the referrer charset and
   // pass it to GetSuggestedFilename.
   std::string value;
   if (headers->EnumerateHeader(NULL, "content-disposition", &value)) {
-    response->setSuggestedFileName(WideToUTF16Hack(
-        net::GetSuggestedFilename(url, value, "", std::wstring())));
+#if defined(OS_WIN)
+    response->setSuggestedFileName(
+        net::GetSuggestedFilename(url, value, "", "").value());
+#else
+    response->setSuggestedFileName(UTF8ToUTF16(
+        net::GetSuggestedFilename(url, value, "", "").value()));
+#endif
   }
 
   Time time_val;
   if (headers->GetLastModifiedValue(&time_val))
     response->setLastModifiedDate(time_val.ToDoubleT());
 
   // Build up the header map.
   void* iter = NULL;
   std::string name;
   while (headers->EnumerateHeaderLines(&iter, &name, &value)) {
@@ skipping 400 matching lines @@
 
 void WebURLLoaderImpl::cancel() {
   context_->Cancel();
 }
 
 void WebURLLoaderImpl::setDefersLoading(bool value) {
   context_->SetDefersLoading(value);
 }
 
 }  // namespace webkit_glue