| Index: net/base/platform_mime_util_linux.cc
|
| diff --git a/net/base/platform_mime_util_linux.cc b/net/base/platform_mime_util_linux.cc
|
| index ff7f79b1549fe81313df94c66e572f0a5b739926..ea57595de24dfa0eb7aed98a9767b9e97452c736 100644
|
| --- a/net/base/platform_mime_util_linux.cc
|
| +++ b/net/base/platform_mime_util_linux.cc
|
| @@ -19,12 +19,14 @@ namespace net {
|
|
|
| #if defined(OS_ANDROID)
|
| bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
|
| - const base::FilePath::StringType& ext, std::string* result) const {
|
| + const base::FilePath::StringType& ext,
|
| + std::string* result) const {
|
| return android::GetMimeTypeFromExtension(ext, result);
|
| }
|
| #else
|
| bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
|
| - const base::FilePath::StringType& ext, std::string* result) const {
|
| + const base::FilePath::StringType& ext,
|
| + std::string* result) const {
|
| // TODO(thestig): This is a temporary hack until we can fix this
|
| // properly in test shell / webkit.
|
| // We have to play dumb and not return application/x-perl here
|
| @@ -60,26 +62,24 @@ struct MimeToExt {
|
| };
|
|
|
| const struct MimeToExt mime_type_ext_map[] = {
|
| - {"application/pdf", "pdf"},
|
| - {"application/x-tar", "tar"},
|
| - {"application/zip", "zip"},
|
| - {"audio/mpeg", "mp3"},
|
| - {"image/gif", "gif"},
|
| - {"image/jpeg", "jpg"},
|
| - {"image/png", "png"},
|
| - {"text/html", "html"},
|
| - {"video/mp4", "mp4"},
|
| - {"video/mpeg", "mpg"},
|
| - {"text/plain", "txt"},
|
| - {"text/x-sh", "sh"},
|
| + {"application/pdf", "pdf"},
|
| + {"application/x-tar", "tar"},
|
| + {"application/zip", "zip"},
|
| + {"audio/mpeg", "mp3"},
|
| + {"image/gif", "gif"},
|
| + {"image/jpeg", "jpg"},
|
| + {"image/png", "png"},
|
| + {"text/html", "html"},
|
| + {"video/mp4", "mp4"},
|
| + {"video/mpeg", "mpg"},
|
| + {"text/plain", "txt"},
|
| + {"text/x-sh", "sh"},
|
| };
|
|
|
| bool PlatformMimeUtil::GetPreferredExtensionForMimeType(
|
| - const std::string& mime_type, base::FilePath::StringType* ext) const {
|
| -
|
| - for (size_t x = 0;
|
| - x < (sizeof(mime_type_ext_map) / sizeof(MimeToExt));
|
| - x++) {
|
| + const std::string& mime_type,
|
| + base::FilePath::StringType* ext) const {
|
| + for (size_t x = 0; x < (sizeof(mime_type_ext_map) / sizeof(MimeToExt)); x++) {
|
| if (mime_type_ext_map[x].mime_type == mime_type) {
|
| *ext = mime_type_ext_map[x].ext;
|
| return true;
|
|
|