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

properly (scoped_cftyperef -> ScopedCFTypeRef).

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3855001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62887 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 9 deletions

diff --git a/app/clipboard/clipboard_mac.mm b/app/clipboard/clipboard_mac.mm
index 0fa5d8f..c587e3a 100644
--- a/app/clipboard/clipboard_mac.mm
+++ b/app/clipboard/clipboard_mac.mm
@@ -9,7 +9,7 @@
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #include "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
@@ -105,16 +105,16 @@ void Clipboard::WriteBitmap(const char* pixel_data, const char* size_data) {
   const gfx::Size* size = reinterpret_cast<const gfx::Size*>(size_data);
 
   // Safe because the image goes away before the call returns.
-  scoped_cftyperef<CFDataRef> data(
+  base::mac::ScopedCFTypeRef<CFDataRef> data(
       CFDataCreateWithBytesNoCopy(kCFAllocatorDefault,
                                   reinterpret_cast<const UInt8*>(pixel_data),
                                   size->width()*size->height()*4,
                                   kCFAllocatorNull));
 
-  scoped_cftyperef<CGDataProviderRef> data_provider(
+  base::mac::ScopedCFTypeRef<CGDataProviderRef> data_provider(
       CGDataProviderCreateWithCFData(data));
 
-  scoped_cftyperef<CGImageRef> cgimage(
+  base::mac::ScopedCFTypeRef<CGImageRef> cgimage(
       CGImageCreate(size->width(),
                     size->height(),
                     8,
diff --git a/app/surface/accelerated_surface_mac.cc b/app/surface/accelerated_surface_mac.cc
index a3cd8b9..c081f4d 100644
--- a/app/surface/accelerated_surface_mac.cc
+++ b/app/surface/accelerated_surface_mac.cc
@@ -8,7 +8,7 @@
 #include "app/gfx/gl/gl_implementation.h"
 #include "app/surface/io_surface_support_mac.h"
 #include "base/logging.h"
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #include "gfx/rect.h"
 
 AcceleratedSurface::AcceleratedSurface()
@@ -110,7 +110,7 @@ static void AddBooleanValue(CFMutableDictionaryRef dictionary,
 static void AddIntegerValue(CFMutableDictionaryRef dictionary,
                             const CFStringRef key,
                             int32 value) {
-  scoped_cftyperef<CFNumberRef> number(
+  base::mac::ScopedCFTypeRef<CFNumberRef> number(
       CFNumberCreate(NULL, kCFNumberSInt32Type, &value));
   CFDictionaryAddValue(dictionary, key, number.get());
 }
@@ -223,7 +223,7 @@ uint64 AcceleratedSurface::SetSurfaceSize(const gfx::Size& size) {
 
   // Allocate a new IOSurface, which is the GPU resource that can be
   // shared across processes.
-  scoped_cftyperef<CFMutableDictionaryRef> properties;
+  base::mac::ScopedCFTypeRef<CFMutableDictionaryRef> properties;
   properties.reset(CFDictionaryCreateMutable(kCFAllocatorDefault,
                                              0,
                                              &kCFTypeDictionaryKeyCallBacks,
diff --git a/app/surface/accelerated_surface_mac.h b/app/surface/accelerated_surface_mac.h
index eb9d4f4..a111c14 100644
--- a/app/surface/accelerated_surface_mac.h
+++ b/app/surface/accelerated_surface_mac.h
@@ -11,7 +11,7 @@
 #include "app/gfx/gl/gl_context.h"
 #include "app/surface/transport_dib.h"
 #include "base/callback.h"
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #include "base/scoped_ptr.h"
 #include "gfx/rect.h"
 #include "gfx/size.h"
@@ -130,7 +130,7 @@ class AcceleratedSurface {
   // 10.6 and later).
   // TODO(dspringer,kbr): Should the GPU backing store be encapsulated in its
   // own class so all this implementation detail is hidden?
-  scoped_cftyperef<CFTypeRef> io_surface_;
+  base::mac::ScopedCFTypeRef<CFTypeRef> io_surface_;
   // TODO(dspringer): If we end up keeping this TransportDIB mechanism, this
   // should really be a scoped_ptr_malloc<>, with a deallocate functor that
   // runs |dib_free_callback_|.  I was not able to figure out how to