Update from https://crrev.com/312398

net/base/mime_util.h

 // 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.
 
 #ifndef NET_BASE_MIME_UTIL_H__
 #define NET_BASE_MIME_UTIL_H__
 
 #include <string>
 #include <vector>
 
@@ skipping 122 matching lines @@
 NET_EXPORT void GetExtensionsForMimeType(
     const std::string& mime_type,
     std::vector<base::FilePath::StringType>* extensions);
 
 // Test only method that removes proprietary media types and codecs from the
 // list of supported MIME types and codecs. These types and codecs must be
 // removed to ensure consistent layout test results across all Chromium
 // variations.
 NET_EXPORT void RemoveProprietaryMediaTypesAndCodecsForTests();
 
-// Returns the IANA media type contained in |mime_type|, or an empty
-// string if |mime_type| does not specifify a known media type.
-// Supported media types are defined at:
-// http://www.iana.org/assignments/media-types/index.html
-NET_EXPORT const std::string GetIANAMediaType(const std::string& mime_type);
-
 // A list of supported certificate-related mime types.
 //
 // A Java counterpart will be generated for this enum.
 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.net
 enum CertificateMimeType {
   CERTIFICATE_MIME_TYPE_UNKNOWN,
   CERTIFICATE_MIME_TYPE_X509_USER_CERT,
   CERTIFICATE_MIME_TYPE_X509_CA_CERT,
   CERTIFICATE_MIME_TYPE_PKCS12_ARCHIVE,
 };
 
 NET_EXPORT CertificateMimeType GetCertificateMimeTypeForMimeType(
     const std::string& mime_type);
 
 // Prepares one value as part of a multi-part upload request.
 NET_EXPORT void AddMultipartValueForUpload(const std::string& value_name,
                                            const std::string& value,
                                            const std::string& mime_boundary,
                                            const std::string& content_type,
                                            std::string* post_data);
 
 // Adds the final delimiter to a multi-part upload request.
 NET_EXPORT void AddMultipartFinalDelimiterForUpload(
     const std::string& mime_boundary,
     std::string* post_data);
 
 }  // namespace net
 
 #endif  // NET_BASE_MIME_UTIL_H__