mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef.

skia/ext/skia_utils_ios.mm

 // Copyright 2012 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_ios.h"
 
 #import <ImageIO/ImageIO.h>
 #import <UIKit/UIKit.h>
 
 #include "base/logging.h"
@@ skipping 13 matching lines @@
 
   bitmap.setIsOpaque(is_opaque);
   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)
-  base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space(
+  base::ScopedCFTypeRef<CGColorSpaceRef> color_space(
       CGColorSpaceCreateDeviceRGB());
-  base::mac::ScopedCFTypeRef<CGContextRef> context(
-      CGBitmapContextCreate(data, size.width, size.height, 8, size.width*4,
-                            color_space,
-                            kCGImageAlphaPremultipliedFirst |
-                                kCGBitmapByteOrder32Host));
+  base::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
 
   DCHECK(context);
   if (!context)
     return bitmap;
 
   CGRect imageRect = CGRectMake(0.0, 0.0, size.width, size.height);
   CGContextSetBlendMode(context, kCGBlendModeCopy);
   CGContextDrawImage(context, imageRect, image);
 
   return bitmap;
 }
 
 UIImage* SkBitmapToUIImageWithColorSpace(const SkBitmap& skia_bitmap,
                                          CGFloat scale,
                                          CGColorSpaceRef color_space) {
   if (skia_bitmap.isNull())
     return nil;
 
   // First convert SkBitmap to CGImageRef.
-  base::mac::ScopedCFTypeRef<CGImageRef> cg_image(
+  base::ScopedCFTypeRef<CGImageRef> cg_image(
       SkCreateCGImageRefWithColorspace(skia_bitmap, color_space));
 
   // Now convert to UIImage.
   return [UIImage imageWithCGImage:cg_image.get()
                              scale:scale
                        orientation:UIImageOrientationUp];
 }
 
 std::vector<SkBitmap> ImageDataToSkBitmaps(NSData* image_data) {
   DCHECK(image_data);
-  base::mac::ScopedCFTypeRef<CFDictionaryRef> empty_dictionary(
+  base::ScopedCFTypeRef<CFDictionaryRef> empty_dictionary(
       CFDictionaryCreate(NULL, NULL, NULL, 0, NULL, NULL));
   std::vector<SkBitmap> frames;
 
-  base::mac::ScopedCFTypeRef<CGImageSourceRef> source(
+  base::ScopedCFTypeRef<CGImageSourceRef> source(
       CGImageSourceCreateWithData((CFDataRef)image_data, empty_dictionary));
 
   size_t count = CGImageSourceGetCount(source);
   for (size_t index = 0; index < count; ++index) {
-    base::mac::ScopedCFTypeRef<CGImageRef> cg_image(
+    base::ScopedCFTypeRef<CGImageRef> cg_image(
         CGImageSourceCreateImageAtIndex(source, index, empty_dictionary));
 
     CGSize size = CGSizeMake(CGImageGetWidth(cg_image),
                              CGImageGetHeight(cg_image));
     const SkBitmap bitmap = CGImageToSkBitmap(cg_image, size, false);
     if (!bitmap.empty())
       frames.push_back(bitmap);
   }
 
   DLOG_IF(WARNING, frames.size() != count) << "Only decoded " << frames.size()
       << " frames for " << count << " expected.";
   return frames;
 }
 
 }  // namespace gfx