Index: skia/ext/skia_utils_mac.mm |
diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm |
index 5622b5d150fdcca7bf57dd0f95a9a28a40f5b10b..4d1ce0041766bdde5e0977c3462afb69699c3767 100644 |
--- a/skia/ext/skia_utils_mac.mm |
+++ b/skia/ext/skia_utils_mac.mm |
@@ -8,7 +8,7 @@ |
#include "base/logging.h" |
#include "base/mac/scoped_cftyperef.h" |
-#include "base/memory/scoped_nsobject.h" |
+#include "base/mac/scoped_nsobject.h" |
#include "base/memory/scoped_ptr.h" |
#include "skia/ext/bitmap_platform_device_mac.h" |
#include "third_party/skia/include/core/SkRegion.h" |
@@ -228,7 +228,7 @@ NSBitmapImageRep* SkBitmapToNSBitmapImageRepWithColorSpace( |
SkCreateCGImageRefWithColorspace(skiaBitmap, colorSpace)); |
// Now convert to NSBitmapImageRep. |
- scoped_nsobject<NSBitmapImageRep> bitmap( |
+ base::scoped_nsobject<NSBitmapImageRep> bitmap( |
[[NSBitmapImageRep alloc] initWithCGImage:cgimage]); |
return [bitmap.release() autorelease]; |
} |
@@ -238,7 +238,7 @@ NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& skiaBitmap, |
if (skiaBitmap.isNull()) |
return nil; |
- scoped_nsobject<NSImage> image([[NSImage alloc] init]); |
+ base::scoped_nsobject<NSImage> image([[NSImage alloc] init]); |
[image addRepresentation: |
SkBitmapToNSBitmapImageRepWithColorSpace(skiaBitmap, colorSpace)]; |
[image setSize:NSMakeSize(skiaBitmap.width(), skiaBitmap.height())]; |