wstring: make net::GetSuggestedFilename return utf-16

chrome/browser/download/download_util.cc

 // Copyright (c) 2011 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.
 //
 // Download utility implementation
 
 #include "chrome/browser/download/download_util.h"
 
 #if defined(OS_WIN)
 #include <shobjidl.h>
@@ skipping 199 matching lines @@
                    info->referrer_charset,
                    info->mime_type,
                    generated_name);
 }
 
 void GenerateFileName(const GURL& url,
                       const std::string& content_disposition,
                       const std::string& referrer_charset,
                       const std::string& mime_type,
                       FilePath* generated_name) {
+  string16 default_file_name(
+      l10n_util::GetStringUTF16(IDS_DEFAULT_DOWNLOAD_FILENAME));
+
+  string16 new_name = net::GetSuggestedFilename(GURL(url),
+                                                content_disposition,
+                                                referrer_charset,
+                                                default_file_name);
+
+  // TODO(evan): this code is totally wrong -- we should just generate
+  // Unicode filenames and do all this encoding switching at the end.
+  // However, I'm just shuffling wrong code around, at least not adding
+  // to it.
 #if defined(OS_WIN)
-  FilePath default_file_path(
-      l10n_util::GetStringUTF16(IDS_DEFAULT_DOWNLOAD_FILENAME));
-#elif defined(OS_POSIX)
-  std::string default_file =
-      l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME);
-  FilePath default_file_path(
-      base::SysWideToNativeMB(base::SysUTF8ToWide(default_file)));
+  *generated_name = FilePath(new_name);
+#else
+  *generated_name = FilePath(
+      base::SysWideToNativeMB(UTF16ToWide(new_name)));
 #endif
 
-  *generated_name = net::GetSuggestedFilename(GURL(url),
-                                              content_disposition,
-                                              referrer_charset,
-                                              default_file_path);
-
   DCHECK(!generated_name->empty());
 
   GenerateSafeFileName(mime_type, generated_name);
 }
 
 void GenerateSafeFileName(const std::string& mime_type, FilePath* file_name) {
   // Make sure we get the right file extension
   FilePath::StringType extension;
   GenerateExtension(*file_name, mime_type, &extension);
   *file_name = file_name->ReplaceExtension(extension);
@@ skipping 527 matching lines @@
         !service->IsDownloadFromGallery(info->url, info->referrer_url)) {
       // Extensions that are not from the gallery are considered dangerous.
       return true;
     }
   }
 
   return false;
 }
 
 }  // namespace download_util