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

content/browser/download/download_stats.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 "content/browser/download/download_stats.h"
 
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_util.h"
 #include "content/browser/download/download_resource_handler.h"
@@ skipping 13 matching lines @@
 };
 
 // These values are based on net::HttpContentDisposition::ParseResult values.
 // Values other than HEADER_PRESENT and IS_VALID are only measured if |IS_VALID|
 // is true.
 enum ContentDispositionCountTypes {
   // Count of downloads which had a Content-Disposition headers. The total
   // number of downloads is measured by UNTHROTTLED_COUNT.
   CONTENT_DISPOSITION_HEADER_PRESENT = 0,
 
-  // At least one of 'name', 'filename' or 'filenae*' attributes were valid and
+  // Either 'filename' or 'filename*' attributes were valid and
   // yielded a non-empty filename.
   CONTENT_DISPOSITION_IS_VALID,
 
   // The following enum values correspond to
   // net::HttpContentDisposition::ParseResult.
   CONTENT_DISPOSITION_HAS_DISPOSITION_TYPE,
   CONTENT_DISPOSITION_HAS_UNKNOWN_TYPE,
-  CONTENT_DISPOSITION_HAS_NAME,
+
+  CONTENT_DISPOSITION_HAS_NAME, // Obsolete; kept for UMA compatiblity.
+
   CONTENT_DISPOSITION_HAS_FILENAME,
   CONTENT_DISPOSITION_HAS_EXT_FILENAME,
   CONTENT_DISPOSITION_HAS_NON_ASCII_STRINGS,
   CONTENT_DISPOSITION_HAS_PERCENT_ENCODED_STRINGS,
   CONTENT_DISPOSITION_HAS_RFC2047_ENCODED_STRINGS,
 
-  // Only have the 'name' attribute is present.
-  CONTENT_DISPOSITION_HAS_NAME_ONLY,
+  CONTENT_DISPOSITION_HAS_NAME_ONLY, // Obsolete; kept for UMA compatiblity.
 
   CONTENT_DISPOSITION_LAST_ENTRY
 };
 
 void RecordContentDispositionCount(ContentDispositionCountTypes type,
                                    bool record) {
   if (!record)
     return;
   UMA_HISTOGRAM_ENUMERATION(
       "Download.ContentDisposition", type, CONTENT_DISPOSITION_LAST_ENTRY);
@@ skipping 437 matching lines @@
   if (!is_valid)
     return;
 
   RecordContentDispositionCountFlag(
       CONTENT_DISPOSITION_HAS_DISPOSITION_TYPE, result,
       net::HttpContentDisposition::HAS_DISPOSITION_TYPE);
   RecordContentDispositionCountFlag(
       CONTENT_DISPOSITION_HAS_UNKNOWN_TYPE, result,
       net::HttpContentDisposition::HAS_UNKNOWN_DISPOSITION_TYPE);
   RecordContentDispositionCountFlag(
-      CONTENT_DISPOSITION_HAS_NAME, result,
-      net::HttpContentDisposition::HAS_NAME);
-  RecordContentDispositionCountFlag(
       CONTENT_DISPOSITION_HAS_FILENAME, result,
       net::HttpContentDisposition::HAS_FILENAME);
   RecordContentDispositionCountFlag(
       CONTENT_DISPOSITION_HAS_EXT_FILENAME, result,
       net::HttpContentDisposition::HAS_EXT_FILENAME);
   RecordContentDispositionCountFlag(
       CONTENT_DISPOSITION_HAS_NON_ASCII_STRINGS, result,
       net::HttpContentDisposition::HAS_NON_ASCII_STRINGS);
   RecordContentDispositionCountFlag(
       CONTENT_DISPOSITION_HAS_PERCENT_ENCODED_STRINGS, result,
       net::HttpContentDisposition::HAS_PERCENT_ENCODED_STRINGS);
   RecordContentDispositionCountFlag(
       CONTENT_DISPOSITION_HAS_RFC2047_ENCODED_STRINGS, result,
       net::HttpContentDisposition::HAS_RFC2047_ENCODED_STRINGS);
-
-  RecordContentDispositionCount(
-      CONTENT_DISPOSITION_HAS_NAME_ONLY,
-      (result & (net::HttpContentDisposition::HAS_NAME |
-                 net::HttpContentDisposition::HAS_FILENAME |
-                 net::HttpContentDisposition::HAS_EXT_FILENAME)) ==
-      net::HttpContentDisposition::HAS_NAME);
 }
 
 void RecordFileThreadReceiveBuffers(size_t num_buffers) {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
       "Download.FileThreadReceiveBuffers", num_buffers, 1,
       100, 100);
 }
 
 void RecordBandwidth(double actual_bandwidth, double potential_bandwidth) {
   UMA_HISTOGRAM_CUSTOM_COUNTS(
@@ skipping 91 matching lines @@
                                    int state) {
   if (is_partial)
     UMA_HISTOGRAM_ENUMERATION("Download.OriginStateOnPartialResumption", state,
                               ORIGIN_STATE_ON_RESUMPTION_MAX);
   else
     UMA_HISTOGRAM_ENUMERATION("Download.OriginStateOnFullResumption", state,
                               ORIGIN_STATE_ON_RESUMPTION_MAX);
 }
 
 }  // namespace content