| Index: net/base/platform_mime_util_mac.mm
|
| diff --git a/net/base/platform_mime_util_mac.mm b/net/base/platform_mime_util_mac.mm
|
| index 99315db98825e126160d6c2935524a460e556304..1b61200e4b467c2289fa7a808ef462ea29794513 100644
|
| --- a/net/base/platform_mime_util_mac.mm
|
| +++ b/net/base/platform_mime_util_mac.mm
|
| @@ -36,17 +36,15 @@ bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
|
| std::string ext_nodot = ext;
|
| if (ext_nodot.length() >= 1 && ext_nodot[0] == L'.')
|
| ext_nodot.erase(ext_nodot.begin());
|
| - base::mac::ScopedCFTypeRef<CFStringRef> ext_ref(
|
| + base::ScopedCFTypeRef<CFStringRef> ext_ref(
|
| base::SysUTF8ToCFStringRef(ext_nodot));
|
| if (!ext_ref)
|
| return false;
|
| - base::mac::ScopedCFTypeRef<CFStringRef> uti(
|
| - UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension,
|
| - ext_ref,
|
| - NULL));
|
| + base::ScopedCFTypeRef<CFStringRef> uti(UTTypeCreatePreferredIdentifierForTag(
|
| + kUTTagClassFilenameExtension, ext_ref, NULL));
|
| if (!uti)
|
| return false;
|
| - base::mac::ScopedCFTypeRef<CFStringRef> mime_ref(
|
| + base::ScopedCFTypeRef<CFStringRef> mime_ref(
|
| UTTypeCopyPreferredTagWithClass(uti, kUTTagClassMIMEType));
|
| if (!mime_ref)
|
| return false;
|
| @@ -57,17 +55,15 @@ bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
|
|
|
| bool PlatformMimeUtil::GetPreferredExtensionForMimeType(
|
| const std::string& mime_type, base::FilePath::StringType* ext) const {
|
| - base::mac::ScopedCFTypeRef<CFStringRef> mime_ref(
|
| + base::ScopedCFTypeRef<CFStringRef> mime_ref(
|
| base::SysUTF8ToCFStringRef(mime_type));
|
| if (!mime_ref)
|
| return false;
|
| - base::mac::ScopedCFTypeRef<CFStringRef> uti(
|
| - UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType,
|
| - mime_ref,
|
| - NULL));
|
| + base::ScopedCFTypeRef<CFStringRef> uti(UTTypeCreatePreferredIdentifierForTag(
|
| + kUTTagClassMIMEType, mime_ref, NULL));
|
| if (!uti)
|
| return false;
|
| - base::mac::ScopedCFTypeRef<CFStringRef> ext_ref(
|
| + base::ScopedCFTypeRef<CFStringRef> ext_ref(
|
| UTTypeCopyPreferredTagWithClass(uti, kUTTagClassFilenameExtension));
|
| if (!ext_ref)
|
| return false;
|
|
|