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

app/clipboard/clipboard_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.
 
 #include "app/clipboard/clipboard.h"
 
 #import <Cocoa/Cocoa.h>
 
 #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"
 #include "gfx/size.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 
 namespace {
 
 // Would be nice if this were in UTCoreTypes.h, but it isn't
 NSString* const kUTTypeURLName = @"public.url-name";
@@ skipping 75 matching lines @@
                                          nil]
          owner:nil];
   [nsurl writeToPasteboard:pb];
   [pb setString:title forType:kUTTypeURLName];
 }
 
 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::win::ScopedCFTypeRef<CFDataRef> data(
       CFDataCreateWithBytesNoCopy(kCFAllocatorDefault,
                                   reinterpret_cast<const UInt8*>(pixel_data),
                                   size->width()*size->height()*4,
                                   kCFAllocatorNull));
 
-  scoped_cftyperef<CGDataProviderRef> data_provider(
+  base::win::ScopedCFTypeRef<CGDataProviderRef> data_provider(
       CGDataProviderCreateWithCFData(data));
 
-  scoped_cftyperef<CGImageRef> cgimage(
+  base::win::ScopedCFTypeRef<CGImageRef> cgimage(
       CGImageCreate(size->width(),
                     size->height(),
                     8,
                     32,
                     size->width()*4,
                     mac_util::GetSRGBColorSpace(),  // TODO(avi): do better
                     kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host,
                     data_provider,
                     NULL,
                     false,
@@ skipping 192 matching lines @@
   static const std::string type = base::SysNSStringToUTF8(NSTIFFPboardType);
   return type;
 }
 
 // static
 Clipboard::FormatType Clipboard::GetWebKitSmartPasteFormatType() {
   static const std::string type =
       base::SysNSStringToUTF8(kWebSmartPastePboardType);
   return type;
 }