Cleanup referrer_charset

chrome/browser/download/chrome_download_manager_delegate.cc

Index: chrome/browser/download/chrome_download_manager_delegate.cc
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
index 56e7ced757e0b9516af9fe89a096ff4bf21348f5..e9e5c4e06aa9ebc47522d2f462d618ba879213fa 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -113,13 +113,14 @@ SafeBrowsingState::~SafeBrowsingState() {}
 // in operation to net::GenerateFileName(), but uses a localized
 // default name.
 void GenerateFileNameFromRequest(const DownloadItem& download_item,
-                                 FilePath* generated_name) {
+                                 FilePath* generated_name,
+                                 std::string referrer_charset) {
   std::string default_file_name(
       l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME));
 
   *generated_name = net::GenerateFileName(download_item.GetURL(),
                                           download_item.GetContentDisposition(),
-                                          download_item.GetReferrerCharset(),
+                                          referrer_charset,
                                           download_item.GetSuggestedFilename(),
                                           download_item.GetMimeType(),
                                           default_file_name);
@@ -718,7 +719,10 @@ void ChromeDownloadManagerDelegate::CheckVisitedReferrerBeforeDone(
   // Allow extensions to be explicitly saved.
   if (!is_forced_path) {
     FilePath generated_name;
-    GenerateFileNameFromRequest(*download, &generated_name);
+    GenerateFileNameFromRequest(
+        *download,
+        &generated_name,
+        profile_->GetPrefs()->GetString(prefs::kDefaultCharset));
 
     // Freeze the user's preference for showing a Save As dialog.  We're going
     // to bounce around a bunch of threads and we don't want to worry about race