download filename fix

chrome/browser/download/download_manager_unittest.cc

 // Copyright (c) 2006-2008 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 <string>
 
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class DownloadManagerTest : public testing::Test {
  public:
   DownloadManagerTest() {
     download_manager_ = new DownloadManager();
     download_util::InitializeExeTypes(&download_manager_->exe_types_);
   }
 
   void GetGeneratedFilename(const std::string& content_disposition,
                             const std::string& url,
                             const std::string& mime_type,
+                            const std::string& referrer_charset,
                             std::wstring* generated_name_string) {
     DownloadCreateInfo info;
     info.content_disposition = content_disposition;
     info.url = GURL(url);
     info.mime_type = mime_type;
+    info.referrer_charset = referrer_charset;
     FilePath generated_name;
     download_manager_->GenerateFilename(&info, &generated_name);
     *generated_name_string = generated_name.ToWStringHack();
   }
 
  protected:
   scoped_refptr<DownloadManager> download_manager_;
   MessageLoopForUI message_loop_;
 
   DISALLOW_EVIL_CONSTRUCTORS(DownloadManagerTest);
@@ skipping 292 matching lines @@
   {"",
    "http://www.example.com/bar.tar",
    "application/x-tar",
    L"bar.tar"},
 
   {"",
    "http://www.example.com/bar.bogus",
    "application/x-tar",
    L"bar.bogus.tar"},
 
-  // TODO(darin): Add some raw 8-bit Content-Disposition tests.
 };
 
 }  // namespace
 
 // Tests to ensure that the file names we generate from hints from the server
 // (content-disposition, URL name, etc) don't cause security holes.
 TEST_F(DownloadManagerTest, TestDownloadFilename) {
+  std::wstring file_name;
   for (int i = 0; i < arraysize(kGeneratedFiles); ++i) {
-    std::wstring file_name;
     GetGeneratedFilename(kGeneratedFiles[i].disposition,
                          kGeneratedFiles[i].url,
                          kGeneratedFiles[i].mime_type,
+                         "",
+                         &file_name);
+    EXPECT_EQ(kGeneratedFiles[i].expected_name, file_name);
+    GetGeneratedFilename(kGeneratedFiles[i].disposition,
+                         kGeneratedFiles[i].url,
+                         kGeneratedFiles[i].mime_type,
+                         "GBK",
                          &file_name);
     EXPECT_EQ(kGeneratedFiles[i].expected_name, file_name);
   }
+
+  // A couple of cases with raw 8bit characters in C-D.
+  GetGeneratedFilename("attachment; filename=caf\xc3\xa9.png",
+                       "http://www.example.com/images?id=3",
+                       "image/png",
+                       "iso-8859-1",
+                       &file_name);
+  EXPECT_EQ(L"caf\u00e9.png", file_name);
+  GetGeneratedFilename("attachment; filename=caf\xe5.png",
+                       "http://www.example.com/images?id=3",
+                       "image/png",
+                       "windows-1253",
+                       &file_name);
+  EXPECT_EQ(L"caf\u03b5.png", file_name);
 }
 
 namespace {
 
 const struct {
   const FilePath::CharType* path;
   const char* mime_type;
   const FilePath::CharType* expected_path;
 } kSafeFilenameCases[] = {
   { FILE_PATH_LITERAL("C:\\foo\\bar.htm"),
@@ skipping 35 matching lines @@
 }  // namespace
 
 TEST_F(DownloadManagerTest, GetSafeFilename) {
   for (int i = 0; i < arraysize(kSafeFilenameCases); ++i) {
     FilePath path(kSafeFilenameCases[i].path);
     download_manager_->GenerateSafeFilename(kSafeFilenameCases[i].mime_type,
         &path);
     EXPECT_EQ(kSafeFilenameCases[i].expected_path, path.value());
   }
 }