| Index: base/message_loop/message_pump_io_ios.cc
|
| diff --git a/base/message_loop/message_pump_io_ios.cc b/base/message_loop/message_pump_io_ios.cc
|
| index 586819545e1ee80ed900753d6d9238c8292734ec..7b1e0f47edd3a8a8dc09c21987936545b66449a0 100644
|
| --- a/base/message_loop/message_pump_io_ios.cc
|
| +++ b/base/message_loop/message_pump_io_ios.cc
|
| @@ -99,9 +99,9 @@ bool MessagePumpIOSForIO::WatchFileDescriptor(
|
|
|
| CFFileDescriptorRef fdref = controller->fdref_;
|
| if (fdref == NULL) {
|
| - base::mac::ScopedCFTypeRef<CFFileDescriptorRef> scoped_fdref(
|
| - CFFileDescriptorCreate(kCFAllocatorDefault, fd, false, HandleFdIOEvent,
|
| - &source_context));
|
| + base::ScopedCFTypeRef<CFFileDescriptorRef> scoped_fdref(
|
| + CFFileDescriptorCreate(
|
| + kCFAllocatorDefault, fd, false, HandleFdIOEvent, &source_context));
|
| if (scoped_fdref == NULL) {
|
| NOTREACHED() << "CFFileDescriptorCreate failed";
|
| return false;
|
| @@ -110,10 +110,9 @@ bool MessagePumpIOSForIO::WatchFileDescriptor(
|
| CFFileDescriptorEnableCallBacks(scoped_fdref, callback_types);
|
|
|
| // TODO(wtc): what should the 'order' argument be?
|
| - base::mac::ScopedCFTypeRef<CFRunLoopSourceRef> scoped_fd_source(
|
| - CFFileDescriptorCreateRunLoopSource(kCFAllocatorDefault,
|
| - scoped_fdref,
|
| - 0));
|
| + base::ScopedCFTypeRef<CFRunLoopSourceRef> scoped_fd_source(
|
| + CFFileDescriptorCreateRunLoopSource(
|
| + kCFAllocatorDefault, scoped_fdref, 0));
|
| if (scoped_fd_source == NULL) {
|
| NOTREACHED() << "CFFileDescriptorCreateRunLoopSource failed";
|
| return false;
|
|
|