download filename fix

chrome/browser/download/download_manager.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.
 
 #include "chrome/browser/download/download_manager.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 1067 matching lines @@
 int DownloadManager::RemoveAllDownloads() {
   // The null times make the date range unbounded.
   return RemoveDownloadsBetween(base::Time(), base::Time());
 }
 
 // Initiate a download of a specific URL. We send the request to the
 // ResourceDispatcherHost, and let it send us responses like a regular
 // download.
 void DownloadManager::DownloadUrl(const GURL& url,
                                   const GURL& referrer,
+                                  const std::string& referrer_charset,
                                   WebContents* web_contents) {
   DCHECK(web_contents);
+  request_context_->set_referrer_charset(referrer_charset);
   file_manager_->DownloadUrl(url,
                              referrer,
                              web_contents->process()->pid(),
                              web_contents->render_view_host()->routing_id(),
                              request_context_.get());
 }
 
 void DownloadManager::GenerateExtension(
     const FilePath& file_name,
     const std::string& mime_type,
@@ skipping 72 matching lines @@
   }
 
   generated_extension->swap(extension);
 }
 
 void DownloadManager::GenerateFilename(DownloadCreateInfo* info,
                                        FilePath* generated_name) {
   *generated_name = FilePath::FromWStringHack(
       net::GetSuggestedFilename(GURL(info->url),
                                 info->content_disposition,
+                                info->referrer_charset,
                                 L"download"));
   DCHECK(!generated_name->empty());
 
   GenerateSafeFilename(info->mime_type, generated_name);
 }
 
 void DownloadManager::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
   observer->ModelChanged();
 }
@@ skipping 300 matching lines @@
       searched_downloads.push_back(dit->second);
   }
 
   requestor->SetDownloads(searched_downloads);
 }
 
 // Clears the last download path, used to initialize "save as" dialogs.
 void DownloadManager::ClearLastDownloadPath() {
   last_download_path_ = FilePath();
 }