Cleanup referrer_charset

chrome/browser/download/chrome_download_manager_delegate.cc

 // Copyright (c) 2012 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/download/chrome_download_manager_delegate.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 95 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingState);
 };
 
 SafeBrowsingState::~SafeBrowsingState() {}
 
 // Generate a filename based on the response from the server.  Similar
 // 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);
 }
 
 // Needed to give PostTask a void closure in OnWebIntentDispatchCompleted.
 void DeleteFile(const FilePath& file_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   file_util::Delete(file_path, false);
 }
@@ skipping 578 matching lines @@
 
   bool should_prompt = (download->GetTargetDisposition() ==
                         DownloadItem::TARGET_DISPOSITION_PROMPT);
   bool is_forced_path = !download->GetForcedFilePath().empty();
   FilePath suggested_path;
 
   // Check whether this download is for an extension install or not.
   // 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
     // conditions where the user changes this pref out from under us.
     if (download_prefs_->PromptForDownload()) {
       // But ignore the user's preference for the following scenarios:
       // 1) Extension installation. Note that we only care here about the case
       //    where an extension is installed, not when one is downloaded with
       //    "save as...".
       // 2) Filetypes marked "always open." If the user just wants this file
@@ skipping 159 matching lines @@
     int32 download_id, int64 db_handle) {
   // It's not immediately obvious, but HistoryBackend::CreateDownload() can
   // call this function with an invalid |db_handle|. For instance, this can
   // happen when the history database is offline. We cannot have multiple
   // DownloadItems with the same invalid db_handle, so we need to assign a
   // unique |db_handle| here.
   if (db_handle == DownloadItem::kUninitializedHandle)
     db_handle = download_history_->GetNextFakeDbHandle();
   download_manager_->OnItemAddedToPersistentStore(download_id, db_handle);
 }