Move scoped_cftyperef from base to base/mac, use the new namespace, and name ...

skia/ext/skia_utils_mac.mm

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "skia/ext/skia_utils_mac.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #include "base/scoped_ptr.h"
 #include "skia/ext/bitmap_platform_device_mac.h"
 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
 
 namespace gfx {
 
 CGAffineTransform SkMatrixToCGAffineTransform(const SkMatrix& matrix) {
   // CGAffineTransforms don't support perspective transforms, so make sure
   // we don't get those.
   DCHECK(matrix[SkMatrix::kMPersp0] == 0.0f);
@@ skipping 95 matching lines @@
 }
 
 SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque) {
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, size.width, size.height);
   if (bitmap.allocPixels() != true)
     return bitmap;  // Return |bitmap| which should respond true to isNull().
 
   bitmap.setIsOpaque(is_opaque);
 
-  scoped_cftyperef<CGColorSpaceRef> color_space(
+  base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space(
     CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
   void* data = bitmap.getPixels();
 
   // Allocate a bitmap context with 4 components per pixel (BGRA). Apple
   // recommends these flags for improved CG performance.
 #define HAS_ARGB_SHIFTS(a, r, g, b) \
             (SK_A32_SHIFT == (a) && SK_R32_SHIFT == (r) \
              && SK_G32_SHIFT == (g) && SK_B32_SHIFT == (b))
 #if defined(SK_CPU_LENDIAN) && HAS_ARGB_SHIFTS(24, 16, 8, 0)
-  scoped_cftyperef<CGContextRef> context(
+  base::mac::ScopedCFTypeRef<CGContextRef> context(
     CGBitmapContextCreate(data, size.width, size.height, 8, size.width*4,
                           color_space,
                           kCGImageAlphaPremultipliedFirst |
                               kCGBitmapByteOrder32Host));
 #else
 #error We require that Skia's and CoreGraphics's recommended \
        image memory layout match.
 #endif
 #undef HAS_ARGB_SHIFTS
 
@@ skipping 36 matching lines @@
   [image setSize:NSMakeSize(skiaBitmap.width(), skiaBitmap.height())];
   return image;
 }
 
 SkBitmap AppplicationIconAtSize(int size) {
   NSImage* image = [NSImage imageNamed:@"NSApplicationIcon"];
   return NSImageToSkBitmap(image, NSMakeSize(size, size), /* is_opaque=*/true);
 }
 
 }  // namespace gfx