| Index: chrome/common/sandbox_mac.mm
|
| ===================================================================
|
| --- chrome/common/sandbox_mac.mm (revision 62861)
|
| +++ chrome/common/sandbox_mac.mm (working copy)
|
| @@ -17,7 +17,7 @@
|
| #include "base/file_util.h"
|
| #include "base/mac_util.h"
|
| #include "base/rand_util_c.h"
|
| -#include "base/scoped_cftyperef.h"
|
| +#include "base/mac/scoped_cftyperef.h"
|
| #include "base/scoped_nsautorelease_pool.h"
|
| #include "base/string16.h"
|
| #include "base/string_util.h"
|
| @@ -190,12 +190,12 @@
|
| base::ScopedNSAutoreleasePool scoped_pool;
|
|
|
| { // CGColorSpaceCreateWithName(), CGBitmapContextCreate() - 10.5.6
|
| - scoped_cftyperef<CGColorSpaceRef> rgb_colorspace(
|
| + base::mac::ScopedCFTypeRef<CGColorSpaceRef> rgb_colorspace(
|
| CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
|
|
|
| // Allocate a 1x1 image.
|
| char data[4];
|
| - scoped_cftyperef<CGContextRef> context(
|
| + base::mac::ScopedCFTypeRef<CGContextRef> context(
|
| CGBitmapContextCreate(data, 1, 1, 8, 1 * 4,
|
| rgb_colorspace,
|
| kCGImageAlphaPremultipliedFirst |
|
| @@ -206,7 +206,7 @@
|
| (void) mac_util::GetSystemColorSpace();
|
|
|
| // CGColorSpaceCreateSystemDefaultCMYK - 10.6
|
| - scoped_cftyperef<CGColorSpaceRef> cmyk_colorspace(
|
| + base::mac::ScopedCFTypeRef<CGColorSpaceRef> cmyk_colorspace(
|
| CGColorSpaceCreateWithName(kCGColorSpaceGenericCMYK));
|
| }
|
|
|
| @@ -231,7 +231,7 @@
|
| char png_header[] = {0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A};
|
| NSData* data = [NSData dataWithBytes:png_header
|
| length:arraysize(png_header)];
|
| - scoped_cftyperef<CGImageSourceRef> img(
|
| + base::mac::ScopedCFTypeRef<CGImageSourceRef> img(
|
| CGImageSourceCreateWithData((CFDataRef)data,
|
| NULL));
|
| CGImageSourceGetStatus(img);
|
|
|