Generated FIlename different from Content Disposition string

net/base/filename_util_unittest.cc

 // Copyright 2014 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 "net/base/filename_util.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 792 matching lines @@
     { // The content-disposition has higher precedence over the suggested name.
       __LINE__,
       "http://www.google.com/test",
       "attachment; filename=test.html",
       "",
       "suggested",
       "",
       L"",
       L"test.html"
     },
+    {
+      __LINE__,
+      "http://www.google.com/test",
+      "attachment; filename=test",
+      "utf-8",
+      "",
+      "image/png",
+      L"",
+      L"test"
+    },
 #if 0
     { // The filename encoding doesn't match the referrer charset, the system
       // charset, or UTF-8.
       // TODO(jshin): we need to handle this case.
       __LINE__,
       "http://example.com/V%FDvojov%E1%20psychologie.doc",
       "",
       "utf-8",
       "",
       "",
@@ skipping 192 matching lines @@
       L"download" TXT_EXT
     },
     { // Filename looks like HTML?
       __LINE__,
       "http://www.evil.com/get/malware/here",
       "filename=\"<blink>Hello kitty</blink>\"",
       "",
       "",
       "text/plain",
       L"default",
-      L"-blink-Hello kitty--blink-" TXT_EXT
+      L"-blink-Hello kitty--blink-"
     },
     { // A normal avi should get .avi and not .avi.avi
       __LINE__,
       "https://blah.google.com/misc/2.avi",
       "",
       "",
       "",
       "video/x-msvideo",
       L"download",
       L"2.avi"
     },
     { // Extension generation
       __LINE__,
       "http://www.example.com/my-cat",
       "filename=my-cat",
       "",
       "",
       "image/jpeg",
       L"download",
-      L"my-cat" JPEG_EXT
+      L"my-cat"
     },
     {
       __LINE__,
       "http://www.example.com/my-cat",
       "filename=my-cat",
       "",
       "",
       "text/plain",
       L"download",
-      L"my-cat.txt"
+      L"my-cat"
     },
     {
       __LINE__,
       "http://www.example.com/my-cat",
       "filename=my-cat",
       "",
       "",
       "text/html",
       L"download",
-      L"my-cat" HTML_EXT
+      L"my-cat"
     },
     { // Unknown MIME type
       __LINE__,
       "http://www.example.com/my-cat",
       "filename=my-cat",
       "",
       "",
       "dance/party",
       L"download",
       L"my-cat"
@@ skipping 203 matching lines @@
       L"-foo.txt"
     },
     {
       __LINE__,
       "http://www.evil.com/.hidden",
       "filename=.hidden",
       "",
       "",
       "text/plain",
       L"download",
-      L"hidden" TXT_EXT
+      L"hidden"
     },
     {
       __LINE__,
       "http://www.evil.com/trailing.",
       "filename=trailing.",
       "",
       "",
       "dance/party",
       L"download",
 #if defined(OS_WIN)
       L"trailing-"
 #else
       L"trailing"
 #endif
     },
     {
       __LINE__,
       "http://www.evil.com/trailing.",
       "filename=trailing.",
       "",
       "",
       "text/plain",
       L"download",
 #if defined(OS_WIN)
-      L"trailing-" TXT_EXT
+      L"trailing-"
 #else
-      L"trailing" TXT_EXT
+      L"trailing"
 #endif
     },
     {
       __LINE__,
       "http://www.evil.com/.",
       "filename=.",
       "",
       "",
       "dance/party",
       L"download",
@@ skipping 331 matching lines @@
     RunGenerateFileNameTestCase(&generation_tests[i]);
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(generation_tests); ++i) {
     GenerateFilenameCase test_case = generation_tests[i];
     test_case.referrer_charset = "GBK";
     RunGenerateFileNameTestCase(&test_case);
   }
 }
 
 }  // namespace net