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

ui/gfx/image/image_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 "ui/gfx/image/image.h"
 
 #include <cmath>
 #include <limits>
 #import <UIKit/UIKit.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_nsobject.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/image/image_png_rep.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_util_ios.h"
 #include "ui/gfx/size.h"
 
 namespace gfx {
 namespace internal {
 
 namespace {
 
 // Returns a 16x16 red UIImage to visually show when a UIImage cannot be
 // created from PNG data. Logs error as well.
 // Caller takes ownership of returned UIImage.
 UIImage* CreateErrorUIImage(float scale) {
   LOG(ERROR) << "Unable to decode PNG into UIImage.";
-  base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space(
+  base::ScopedCFTypeRef<CGColorSpaceRef> color_space(
       CGColorSpaceCreateDeviceRGB());
-  base::mac::ScopedCFTypeRef<CGContextRef> context(
-      CGBitmapContextCreate(NULL,  // Allow CG to allocate memory.
-                            16,  // width
-                            16,  // height
-                            8,  // bitsPerComponent
-                            0,  // CG will calculate by default.
-                            color_space,
-                            kCGImageAlphaPremultipliedFirst |
-                                kCGBitmapByteOrder32Host));
+  base::ScopedCFTypeRef<CGContextRef> context(CGBitmapContextCreate(
+      NULL,  // Allow CG to allocate memory.
+      16,    // width
+      16,    // height
+      8,     // bitsPerComponent
+      0,     // CG will calculate by default.
+      color_space,
+      kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
   CGContextSetRGBFillColor(context, 1.0, 0.0, 0.0, 1.0);
   CGContextFillRect(context, CGRectMake(0.0, 0.0, 16, 16));
-  base::mac::ScopedCFTypeRef<CGImageRef> cg_image(
+  base::ScopedCFTypeRef<CGImageRef> cg_image(
       CGBitmapContextCreateImage(context));
   return [[UIImage imageWithCGImage:cg_image.get()
                               scale:scale
                         orientation:UIImageOrientationUp] retain];
 }
 
 // Converts from ImagePNGRep to UIImage.
 UIImage* CreateUIImageFromImagePNGRep(const gfx::ImagePNGRep& image_png_rep) {
   float scale = ui::GetScaleFactorScale(image_png_rep.scale_factor);
   scoped_refptr<base::RefCountedMemory> png = image_png_rep.raw_data;
@@ skipping 75 matching lines @@
 }
 
 gfx::Size UIImageSize(UIImage* image) {
   int width = static_cast<int>(image.size.width);
   int height = static_cast<int>(image.size.height);
   return gfx::Size(width, height);
 }
 
 } // namespace internal
 } // namespace gfx