Remove support for "name" parameter from Content-Disposition.

net/http/http_content_disposition_unittest.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 "net/http/http_content_disposition.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 struct FileNameCDCase {
   const char* header;
   const char* referrer_charset;
   const wchar_t* expected;
 };
 
 }  // anonymous namespace
 
 TEST(HttpContentDispositionTest, Filename) {
   const FileNameCDCase tests[] = {
     // Test various forms of C-D header fields emitted by web servers.
     {"inline; filename=\"abcde.pdf\"", "", L"abcde.pdf"},
-    {"inline; name=\"abcde.pdf\"", "", L"abcde.pdf"},
     {"attachment; filename=abcde.pdf", "", L"abcde.pdf"},
-    {"attachment; name=abcde.pdf", "", L"abcde.pdf"},
     {"attachment; filename=abc,de.pdf", "", L"abc,de.pdf"},
     {"filename=abcde.pdf", "", L"abcde.pdf"},
     {"filename= abcde.pdf", "", L"abcde.pdf"},
     {"filename =abcde.pdf", "", L"abcde.pdf"},
     {"filename = abcde.pdf", "", L"abcde.pdf"},
     {"filename\t=abcde.pdf", "", L"abcde.pdf"},
     {"filename \t\t  =abcde.pdf", "", L"abcde.pdf"},
-    {"name=abcde.pdf", "", L"abcde.pdf"},
     {"inline; filename=\"abc%20de.pdf\"", "",
      L"abc de.pdf"},
+    // Name values are no longer synonyms for filename.
+    {"inline; name=\"abcde.pdf\"", "", L""},
+    {"attachment; name=abcde.pdf", "", L""},
+    {"name=abcde.pdf", "", L""},
     // Unbalanced quotation mark
     {"filename=\"abcdef.pdf", "", L"abcdef.pdf"},
     // Whitespaces are converted to a space.
     {"inline; filename=\"abc  \t\nde.pdf\"", "",
      L"abc    de.pdf"},
     // %-escaped UTF-8
     {"attachment; filename=\"%EC%98%88%EC%88%A0%20"
      "%EC%98%88%EC%88%A0.jpg\"", "", L"\xc608\xc220 \xc608\xc220.jpg"},
     {"attachment; filename=\"%F0%90%8C%B0%F0%90%8C%B1"
      "abc.jpg\"", "", L"\U00010330\U00010331abc.jpg"},
@@ skipping 259 matching lines @@
       {"attachment; filename=\"50%.html\"",
        HttpContentDisposition::ATTACHMENT,
        L"50%.html"},
       // http://greenbytes.de/tech/tc2231/#attwithfnrawpctencaq
       {
        "attachment; filename=\"foo-%\\41.html\"",
        HttpContentDisposition::ATTACHMENT,
        L"foo-A.html"  // Should be L"foo-%41.html"
       },
       // http://greenbytes.de/tech/tc2231/#attwithnamepct
+      // Value is skipped like other UAs.
       {
        "attachment; name=\"foo-%41.html\"",
        HttpContentDisposition::ATTACHMENT,
-       L"foo-A.html"  // Should be L"foo-%41.html"
+       L""
       },
 #ifdef ICU_SHOULD_FAIL_CONVERSION_ON_INVALID_CHARACTER
       // http://greenbytes.de/tech/tc2231/#attwithfilenamepctandiso
       {
        "attachment; filename=\"\xE4-%41.html\"",
        HttpContentDisposition::ATTACHMENT,
        L""  // Should be L"\xE4-%41.htm"
       },
 #endif
       // http://greenbytes.de/tech/tc2231/#attwithfnrawpctenclong
@@ skipping 140 matching lines @@
     { "filename=x", HttpContentDisposition::HAS_FILENAME },
     { "example; filename=x",
       HttpContentDisposition::HAS_DISPOSITION_TYPE |
       HttpContentDisposition::HAS_UNKNOWN_DISPOSITION_TYPE |
       HttpContentDisposition::HAS_FILENAME},
     { "attachment; filename=x",
       HttpContentDisposition::HAS_DISPOSITION_TYPE |
       HttpContentDisposition::HAS_FILENAME },
     { "attachment; filename=x; name=y",
       HttpContentDisposition::HAS_DISPOSITION_TYPE |
-      HttpContentDisposition::HAS_FILENAME |
-      HttpContentDisposition::HAS_NAME },
+      HttpContentDisposition::HAS_FILENAME },
     { "attachment; name=y; filename*=utf-8''foo; name=x",
       HttpContentDisposition::HAS_DISPOSITION_TYPE |
-      HttpContentDisposition::HAS_EXT_FILENAME |
-      HttpContentDisposition::HAS_NAME },
+      HttpContentDisposition::HAS_EXT_FILENAME },
 
     // Feature tests for 'filename' attribute.
     { "filename=foo\xcc\x88",
       HttpContentDisposition::HAS_FILENAME |
       HttpContentDisposition::HAS_NON_ASCII_STRINGS },
     { "filename=foo%cc%88",
       HttpContentDisposition::HAS_FILENAME |
       HttpContentDisposition::HAS_PERCENT_ENCODED_STRINGS },
     { "filename==?utf-8?Q?foo?=",
       HttpContentDisposition::HAS_FILENAME |
       HttpContentDisposition::HAS_RFC2047_ENCODED_STRINGS },
     { "filename=\"=?utf-8?Q?foo?=\"",
       HttpContentDisposition::HAS_FILENAME |
       HttpContentDisposition::HAS_RFC2047_ENCODED_STRINGS },
     { "filename==?utf-8?Q?foo?", HttpContentDisposition::INVALID },
-    { "name=foo\xcc\x88",
-      HttpContentDisposition::HAS_NAME },
+
+    // Test 'name' isn't a synonym for 'filename'.
+    { "name=foo\xcc\x88", HttpContentDisposition::INVALID },
 
     // Shouldn't set |has_non_ascii_strings| based on 'name' attribute.
     { "filename=x; name=foo\xcc\x88",
-      HttpContentDisposition::HAS_FILENAME |
-      HttpContentDisposition::HAS_NAME },
+      HttpContentDisposition::HAS_FILENAME },
     { "filename=foo\xcc\x88 foo%cc%88 =?utf-8?Q?foo?=",
       HttpContentDisposition::HAS_FILENAME |
       HttpContentDisposition::HAS_NON_ASCII_STRINGS |
       HttpContentDisposition::HAS_PERCENT_ENCODED_STRINGS |
       HttpContentDisposition::HAS_RFC2047_ENCODED_STRINGS },
 
     // If 'filename' attribute is invalid, should set any flags based on it.
     { "filename=foo\xcc\x88 foo%cc%88 =?utf-8?Q?foo?",
       HttpContentDisposition::INVALID },
     { "filename=foo\xcc\x88 foo%cc%88 =?utf-8?Q?foo?; name=x",
-      HttpContentDisposition::HAS_NAME },
+      HttpContentDisposition::INVALID },
   };
 
   for (size_t i = 0; i < arraysize(kTestCases); ++i) {
     const ParseResultTestCase& test_case = kTestCases[i];
     HttpContentDisposition content_disposition(test_case.header, "utf-8");
     int result = content_disposition.parse_result_flags();
 
     SCOPED_TRACE(testing::Message() << "Test case " << i
                                     << " with header " << test_case.header);
     EXPECT_EQ(test_case.expected_flags, result);
   }
 }
 
 }  // namespace net