Prefer 'filename' parameters if both 'name' and 'filename' parameters are specified in a Content-Di…

net/http/http_content_disposition.cc

Index: net/http/http_content_disposition.cc
diff --git a/net/http/http_content_disposition.cc b/net/http/http_content_disposition.cc
index 5ec09c94a47e2e7e58c8ab4a805a3d3fa1dd9f74..52d9f4fdf2435e80b4394910d19a8d1ad33c4839 100644
--- a/net/http/http_content_disposition.cc
+++ b/net/http/http_content_disposition.cc
@@ -69,6 +69,7 @@ void HttpContentDisposition::Parse(const std::string& header,
   std::string::const_iterator end = header.end();
   pos = ConsumeDispositionType(pos, end);
 
+  std::string name;
   std::string filename;
   std::string ext_filename;
 
@@ -78,10 +79,10 @@ void HttpContentDisposition::Parse(const std::string& header,
                                                  iter.name_end(),
                                                  "filename")) {
       DecodeFilenameValue(iter.value(), referrer_charset, &filename);
-    } else if (filename.empty() && LowerCaseEqualsASCII(iter.name_begin(),
-                                                        iter.name_end(),
-                                                        "name")) {
-      DecodeFilenameValue(iter.value(), referrer_charset, &filename);
+    } else if (name.empty() && LowerCaseEqualsASCII(iter.name_begin(),
+                                                    iter.name_end(),
+                                                    "name")) {
+      DecodeFilenameValue(iter.value(), referrer_charset, &name);
     } else if (ext_filename.empty() && LowerCaseEqualsASCII(iter.name_begin(),
                                                             iter.name_end(),
                                                             "filename*")) {
@@ -89,7 +90,12 @@ void HttpContentDisposition::Parse(const std::string& header,
     }
   }
 
-  filename_ = ext_filename.empty() ? filename : ext_filename;
+  if (!ext_filename.empty())
+    filename_ = ext_filename;
+  else if (!filename.empty())
+    filename_ = filename;
+  else
+    filename_ = name;
 }
 
 }  // namespace net