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

chrome/browser/cocoa/tab_view.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/tab_view.h"
 
 #include "base/logging.h"
 #import "base/mac_util.h"
+#include "base/mac/mac/scoped_cftyperef.h"
 #include "base/nsimage_cache_mac.h"
-#include "base/scoped_cftyperef.h"
 #import "chrome/browser/cocoa/tab_controller.h"
 #import "chrome/browser/cocoa/tab_window_controller.h"
 #import "chrome/browser/cocoa/themed_window.h"
 #import "chrome/browser/cocoa/view_id_util.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "grit/theme_resources.h"
 
 namespace {
 
 // Constants for inset and control points for tab shape.
@@ skipping 939 matching lines @@
   CGWindowID windowID = [window windowNumber];
   if (useCache) {
     std::map<CGWindowID, int>::iterator iter =
         workspaceIDCache_.find(windowID);
     if (iter != workspaceIDCache_.end())
       return iter->second;
   }
 
   int workspace = -1;
   // It's possible to query in bulk, but probably not necessary.
-  scoped_cftyperef<CFArrayRef> windowIDs(CFArrayCreate(
+  base::mac::ScopedCFTypeRef<CFArrayRef> windowIDs(CFArrayCreate(
       NULL, reinterpret_cast<const void **>(&windowID), 1, NULL));
-  scoped_cftyperef<CFArrayRef> descriptions(
+  base::mac::ScopedCFTypeRef<CFArrayRef> descriptions(
       CGWindowListCreateDescriptionFromArray(windowIDs));
   DCHECK(CFArrayGetCount(descriptions.get()) <= 1);
   if (CFArrayGetCount(descriptions.get()) > 0) {
     CFDictionaryRef dict = static_cast<CFDictionaryRef>(
         CFArrayGetValueAtIndex(descriptions.get(), 0));
     DCHECK(CFGetTypeID(dict) == CFDictionaryGetTypeID());
 
     // Sanity check the ID.
     CFNumberRef otherIDRef = (CFNumberRef)mac_util::GetValueFromDictionary(
         dict, kCGWindowNumber, CFNumberGetTypeID());
@@ skipping 54 matching lines @@
        controlPoint1:NSMakePoint(topRight.x + bottomControlPointInset,
                                  topRight.y)
        controlPoint2:NSMakePoint(bottomRight.x - baseControlPointOutset,
                                  bottomRight.y)];
   [path lineToPoint:NSMakePoint(bottomRight.x + 1, bottomRight.y)];
   [path lineToPoint:NSMakePoint(bottomRight.x + 1, bottomRight.y - 2)];
   return path;
 }
 
 @end  // @implementation TabView(Private)