| Index: base/native_library_mac.mm
|
| diff --git a/base/native_library_mac.mm b/base/native_library_mac.mm
|
| index 11347448545bfc4df04c8b9917ffa70215049b19..15f9e8849cd19aff01000a929b3739bd0ebb6cde 100644
|
| --- a/base/native_library_mac.mm
|
| +++ b/base/native_library_mac.mm
|
| @@ -56,12 +56,11 @@ NativeLibrary LoadNativeLibrary(const base::FilePath& library_path,
|
| native_lib->objc_status = OBJC_UNKNOWN;
|
| return native_lib;
|
| }
|
| - base::mac::ScopedCFTypeRef<CFURLRef> url(
|
| - CFURLCreateFromFileSystemRepresentation(
|
| - kCFAllocatorDefault,
|
| - (const UInt8*)library_path.value().c_str(),
|
| - library_path.value().length(),
|
| - true));
|
| + base::ScopedCFTypeRef<CFURLRef> url(CFURLCreateFromFileSystemRepresentation(
|
| + kCFAllocatorDefault,
|
| + (const UInt8*)library_path.value().c_str(),
|
| + library_path.value().length(),
|
| + true));
|
| if (!url)
|
| return NULL;
|
| CFBundleRef bundle = CFBundleCreate(kCFAllocatorDefault, url.get());
|
| @@ -103,9 +102,8 @@ void* GetFunctionPointerFromNativeLibrary(NativeLibrary library,
|
|
|
| // Get the function pointer using the right API for the type.
|
| if (library->type == BUNDLE) {
|
| - base::mac::ScopedCFTypeRef<CFStringRef> symbol_name(
|
| - CFStringCreateWithCString(kCFAllocatorDefault, name,
|
| - kCFStringEncodingUTF8));
|
| + base::ScopedCFTypeRef<CFStringRef> symbol_name(CFStringCreateWithCString(
|
| + kCFAllocatorDefault, name, kCFStringEncodingUTF8));
|
| function_pointer = CFBundleGetFunctionPointerForName(library->bundle,
|
| symbol_name);
|
| } else {
|
|
|