diff options
| -rw-r--r-- | base/files/file_path.cc | 6 | ||||
| -rw-r--r-- | base/mac/scoped_cftyperef.h | 6 | ||||
| -rw-r--r-- | base/message_loop/message_pump_io_ios.cc | 2 |
3 files changed, 4 insertions, 10 deletions
diff --git a/base/files/file_path.cc b/base/files/file_path.cc index ef0cde6..be34634 100644 --- a/base/files/file_path.cc +++ b/base/files/file_path.cc @@ -1171,7 +1171,7 @@ int FilePath::HFSFastUnicodeCompare(const StringType& string1, } StringType FilePath::GetHFSDecomposedForm(const StringType& string) { - mac::ScopedCFTypeRef<CFStringRef> cfstring( + ScopedCFTypeRef<CFStringRef> cfstring( CFStringCreateWithBytesNoCopy( NULL, reinterpret_cast<const UInt8*>(string.c_str()), @@ -1218,7 +1218,7 @@ int FilePath::CompareIgnoreCase(const StringType& string1, // GetHFSDecomposedForm() returns an empty string in an error case. if (hfs1.empty() || hfs2.empty()) { NOTREACHED(); - mac::ScopedCFTypeRef<CFStringRef> cfstring1( + ScopedCFTypeRef<CFStringRef> cfstring1( CFStringCreateWithBytesNoCopy( NULL, reinterpret_cast<const UInt8*>(string1.c_str()), @@ -1226,7 +1226,7 @@ int FilePath::CompareIgnoreCase(const StringType& string1, kCFStringEncodingUTF8, false, kCFAllocatorNull)); - mac::ScopedCFTypeRef<CFStringRef> cfstring2( + ScopedCFTypeRef<CFStringRef> cfstring2( CFStringCreateWithBytesNoCopy( NULL, reinterpret_cast<const UInt8*>(string2.c_str()), diff --git a/base/mac/scoped_cftyperef.h b/base/mac/scoped_cftyperef.h index f09fcbf..c41de80 100644 --- a/base/mac/scoped_cftyperef.h +++ b/base/mac/scoped_cftyperef.h @@ -101,12 +101,6 @@ class ScopedCFTypeRef { CFT object_; }; -// TODO(thakis): Remove this once all clients use base::ScopedCFTypeRef -// directly. -namespace mac { -using base::ScopedCFTypeRef; -} // namespace mac - } // namespace base #endif // BASE_MAC_SCOPED_CFTYPEREF_H_ diff --git a/base/message_loop/message_pump_io_ios.cc b/base/message_loop/message_pump_io_ios.cc index 7b1e0f4..0dd6930 100644 --- a/base/message_loop/message_pump_io_ios.cc +++ b/base/message_loop/message_pump_io_ios.cc @@ -179,7 +179,7 @@ void MessagePumpIOSForIO::HandleFdIOEvent(CFFileDescriptorRef fdref, // Ensure that |fdref| will remain live for the duration of this function // call even if |controller| is deleted or |StopWatchingFileDescriptor()| is // called, either of which will cause |fdref| to be released. - mac::ScopedCFTypeRef<CFFileDescriptorRef> scoped_fdref( + ScopedCFTypeRef<CFFileDescriptorRef> scoped_fdref( fdref, base::scoped_policy::RETAIN); int fd = CFFileDescriptorGetNativeDescriptor(fdref); |