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

chrome/browser/cocoa/animatable_image.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 "chrome/browser/cocoa/animatable_image.h"
 
 #include "base/logging.h"
 #import "base/mac_util.h"
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 
 @interface AnimatableImage (Private)
 - (void)setLayerContents:(CALayer*)layer;
 @end
 
 @implementation AnimatableImage
 
 @synthesize startFrame = startFrame_;
 @synthesize endFrame = endFrame_;
@@ skipping 103 matching lines @@
     [layer addAnimation:boundsAnimation forKey:@"bounds"];
   }
   [layer addAnimation:positionAnimation forKey:@"position"];
   [layer addAnimation:opacityAnimation forKey:@"opacity"];
   [CATransaction commit];
 }
 
 // Sets the layer contents by converting the NSImage to a CGImageRef.  This will
 // rasterize PDF resources.
 - (void)setLayerContents:(CALayer*)layer {
-  scoped_cftyperef<CGImageRef> image(
+  base::mac::ScopedCFTypeRef<CGImageRef> image(
       mac_util::CopyNSImageToCGImage(image_.get()));
   // Create the layer that will be animated.
   [layer setContents:(id)image.get()];
 }
 
 // CAAnimation delegate method called when the animation is complete.
 - (void)animationDidStop:(CAAnimation*)animation finished:(BOOL)flag {
   // Close the window, releasing self.
   [self close];
 }
 
 @end