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

gfx/canvas_skia_mac.mm

 // Copyright (c) 2010 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "gfx/canvas_skia.h"
 
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #include "base/sys_string_conversions.h"
 #include "gfx/font.h"
 #include "gfx/rect.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 namespace gfx {
 
 CanvasSkia::CanvasSkia(int width, int height, bool is_opaque)
     : skia::PlatformCanvas(width, height, is_opaque) {
 }
@@ skipping 43 matching lines @@
   NSDictionary* attributes =
       [NSDictionary dictionaryWithObjectsAndKeys:
           font.GetNativeFont(), NSFontAttributeName,
           ns_color, NSForegroundColorAttributeName,
           ns_style, NSParagraphStyleAttributeName,
           nil];
 
   NSAttributedString* ns_string =
       [[[NSAttributedString alloc] initWithString:base::SysWideToNSString(text)
                                         attributes:attributes] autorelease];
-  scoped_cftyperef<CTFramesetterRef> framesetter(
+  base::mac::ScopedCFTypeRef<CTFramesetterRef> framesetter(
       CTFramesetterCreateWithAttributedString(
       reinterpret_cast<CFAttributedStringRef>(ns_string)));
 
   CGRect text_bounds = CGRectMake(x, y, w, h);
   CGMutablePathRef path = CGPathCreateMutable();
   CGPathAddRect(path, NULL, text_bounds);
 
-  scoped_cftyperef<CTFrameRef> frame(
+  base::mac::ScopedCFTypeRef<CTFrameRef> frame(
       CTFramesetterCreateFrame(framesetter, CFRangeMake(0, 0), path, NULL));
   CTFrameDraw(frame, context);
   CGContextRestoreGState(context);
   endPlatformPaint();
 }
 
 }  // namespace gfx