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

base/mac_util_unittest.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 <vector>
 
 #include "base/mac_util.h"
 
 #import "base/chrome_application_mac.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace mac_util {
 
 namespace {
 
 typedef PlatformTest MacUtilTest;
@@ skipping 120 matching lines @@
   EXPECT_FALSE(CSBackupIsItemExcluded((CFURLRef)fileURL, &excludeByPath));
   // Exclude the file.
   EXPECT_TRUE(SetFileBackupExclusion(file_path, true));
   EXPECT_TRUE(CSBackupIsItemExcluded((CFURLRef)fileURL, &excludeByPath));
   // Un-exclude the file.
   EXPECT_TRUE(SetFileBackupExclusion(file_path, false));
   EXPECT_FALSE(CSBackupIsItemExcluded((CFURLRef)fileURL, &excludeByPath));
 }
 
 TEST_F(MacUtilTest, TestGetValueFromDictionary) {
-  scoped_cftyperef<CFMutableDictionaryRef> dict(
+  base::mac::ScopedCFTypeRef<CFMutableDictionaryRef> dict(
       CFDictionaryCreateMutable(0, 0,
                                 &kCFTypeDictionaryKeyCallBacks,
                                 &kCFTypeDictionaryValueCallBacks));
   CFDictionarySetValue(dict.get(), CFSTR("key"), CFSTR("value"));
 
   EXPECT_TRUE(CFEqual(CFSTR("value"),
                       GetValueFromDictionary(
                           dict, CFSTR("key"), CFStringGetTypeID())));
   EXPECT_FALSE(GetValueFromDictionary(dict, CFSTR("key"), CFNumberGetTypeID()));
   EXPECT_FALSE(GetValueFromDictionary(
                    dict, CFSTR("no-exist"), CFStringGetTypeID()));
 }
 
 TEST_F(MacUtilTest, CopyNSImageToCGImage) {
   scoped_nsobject<NSImage> nsImage(
       [[NSImage alloc] initWithSize:NSMakeSize(20, 20)]);
   [nsImage lockFocus];
   [[NSColor redColor] set];
   NSRect rect = NSZeroRect;
   rect.size = [nsImage size];
   NSRectFill(rect);
   [nsImage unlockFocus];
 
-  scoped_cftyperef<CGImageRef> cgImage(
+  base::mac::ScopedCFTypeRef<CGImageRef> cgImage(
       mac_util::CopyNSImageToCGImage(nsImage.get()));
   EXPECT_TRUE(cgImage.get());
 }
 
 TEST_F(MacUtilTest, NSObjectRetainRelease) {
   scoped_nsobject<NSArray> array([[NSArray alloc] initWithObjects:@"foo", nil]);
   EXPECT_EQ(1U, [array retainCount]);
 
   mac_util::NSObjectRetain(array);
   EXPECT_EQ(2U, [array retainCount]);
 
   mac_util::NSObjectRelease(array);
   EXPECT_EQ(1U, [array retainCount]);
 }
 
 }  // namespace
 
 }  // namespace mac_util