1 files changed, 31 insertions, 26 deletions
diff --git a/net/base/mime_util.h b/net/base/mime_util.h
index 545abe0..7640504 100644
--- a/net/base/mime_util.h
+++ b/net/base/mime_util.h
@@ -10,98 +10,103 @@
 #include <vector>
 
 #include "base/file_path.h"
-#include "net/base/net_api.h"
+#include "net/base/net_export.h"
 
 namespace net {
 
 // Get the mime type (if any) that is associated with the given file extension.
 // Returns true if a corresponding mime type exists.
-NET_API bool GetMimeTypeFromExtension(const FilePath::StringType& ext,
-                                      std::string* mime_type);
+NET_EXPORT bool GetMimeTypeFromExtension(const FilePath::StringType& ext,
+                                         std::string* mime_type);
 
 // Get the mime type (if any) that is associated with the given file extension.
 // Returns true if a corresponding mime type exists. In this method,
 // the search for a mime type is constrained to a limited set of
 // types known to the net library, the OS/registry is not consulted.
-NET_API bool GetWellKnownMimeTypeFromExtension(const FilePath::StringType& ext,
-                                               std::string* mime_type);
+NET_EXPORT bool GetWellKnownMimeTypeFromExtension(
+    const FilePath::StringType& ext,
+    std::string* mime_type);
 
 // Get the mime type (if any) that is associated with the given file.  Returns
 // true if a corresponding mime type exists.
-NET_API bool GetMimeTypeFromFile(const FilePath& file_path,
-                                 std::string* mime_type);
+NET_EXPORT bool GetMimeTypeFromFile(const FilePath& file_path,
+                                    std::string* mime_type);
 
 // Get the preferred extension (if any) associated with the given mime type.
 // Returns true if a corresponding file extension exists.  The extension is
 // returned without a prefixed dot, ex "html".
-NET_API bool GetPreferredExtensionForMimeType(const std::string& mime_type,
-                                              FilePath::StringType* extension);
+NET_EXPORT bool GetPreferredExtensionForMimeType(
+    const std::string& mime_type,
+    FilePath::StringType* extension);
 
 // Check to see if a particular MIME type is in our list.
-NET_API bool IsSupportedImageMimeType(const char* mime_type);
-NET_API bool IsSupportedMediaMimeType(const char* mime_type);
-NET_API bool IsSupportedNonImageMimeType(const char* mime_type);
-NET_API bool IsSupportedJavascriptMimeType(const char* mime_type);
+NET_EXPORT bool IsSupportedImageMimeType(const char* mime_type);
+NET_EXPORT bool IsSupportedMediaMimeType(const char* mime_type);
+NET_EXPORT bool IsSupportedNonImageMimeType(const char* mime_type);
+NET_EXPORT bool IsSupportedJavascriptMimeType(const char* mime_type);
 
 // Get whether this mime type should be displayed in view-source mode.
 // (For example, XML.)
-NET_API bool IsViewSourceMimeType(const char* mime_type);
+NET_EXPORT bool IsViewSourceMimeType(const char* mime_type);
 
 // Convenience function.
-NET_API bool IsSupportedMimeType(const std::string& mime_type);
+NET_EXPORT bool IsSupportedMimeType(const std::string& mime_type);
 
 // Returns true if this the mime_type_pattern matches a given mime-type.
 // Checks for absolute matching and wildcards.  mime-types should be in
 // lower case.
-NET_API bool MatchesMimeType(const std::string &mime_type_pattern,
+NET_EXPORT bool MatchesMimeType(const std::string &mime_type_pattern,
                              const std::string &mime_type);
 
 // Returns true if and only if all codecs are supported, false otherwise.
-NET_API bool AreSupportedMediaCodecs(const std::vector<std::string>& codecs);
+NET_EXPORT bool AreSupportedMediaCodecs(const std::vector<std::string>& codecs);
 
 // Parses a codec string, populating |codecs_out| with the prefix of each codec
 // in the string |codecs_in|. For example, passed "aaa.b.c,dd.eee", if
 // |strip| == true |codecs_out| will contain {"aaa", "dd"}, if |strip| == false
 // |codecs_out| will contain {"aaa.b.c", "dd.eee"}.
 // See http://www.ietf.org/rfc/rfc4281.txt.
-NET_API void ParseCodecString(const std::string& codecs,
-                              std::vector<std::string>* codecs_out,
-                              bool strip);
+NET_EXPORT void ParseCodecString(const std::string& codecs,
+                                 std::vector<std::string>* codecs_out,
+                                 bool strip);
 
 // Check to see if a particular MIME type is in our list which only supports a
 // certain subset of codecs.
-NET_API bool IsStrictMediaMimeType(const std::string& mime_type);
+NET_EXPORT bool IsStrictMediaMimeType(const std::string& mime_type);
 
 // Check to see if a particular MIME type is in our list which only supports a
 // certain subset of codecs. Returns true if and only if all codecs are
 // supported for that specific MIME type, false otherwise. If this returns
 // false you will still need to check if the media MIME tpyes and codecs are
 // supported.
-NET_API bool IsSupportedStrictMediaMimeType(
+NET_EXPORT bool IsSupportedStrictMediaMimeType(
     const std::string& mime_type,
     const std::vector<std::string>& codecs);
 
 // Get the extensions for images files.
 // Note that we do not erase the existing elements in the the provided vector.
 // Instead, we append the result to it.
-NET_API void GetImageExtensions(std::vector<FilePath::StringType>* extensions);
+NET_EXPORT void GetImageExtensions(
+    std::vector<FilePath::StringType>* extensions);
 
 // Get the extensions for audio files.
 // Note that we do not erase the existing elements in the the provided vector.
 // Instead, we append the result to it.
-NET_API void GetAudioExtensions(std::vector<FilePath::StringType>* extensions);
+NET_EXPORT void GetAudioExtensions(
+    std::vector<FilePath::StringType>* extensions);
 
 // Get the extensions for video files.
 // Note that we do not erase the existing elements in the the provided vector.
 // Instead, we append the result to it.
-NET_API void GetVideoExtensions(std::vector<FilePath::StringType>* extensions);
+NET_EXPORT void GetVideoExtensions(
+    std::vector<FilePath::StringType>* extensions);
 
 // Get the extensions associated with the given mime type.
 // There could be multiple extensions for a given mime type, like "html,htm"
 // for "text/html".
 // Note that we do not erase the existing elements in the the provided vector.
 // Instead, we append the result to it.
-NET_API void GetExtensionsForMimeType(
+NET_EXPORT void GetExtensionsForMimeType(
     const std::string& mime_type,
     std::vector<FilePath::StringType>* extensions);