mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef.

ui/gfx/render_text_mac.cc

 // Copyright (c) 2012 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 "ui/gfx/render_text_mac.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 
 #include <cmath>
 #include <utility>
@@ skipping 89 matching lines @@
   runs_valid_ = false;
 }
 
 void RenderTextMac::EnsureLayout() {
   if (line_.get())
     return;
   runs_.clear();
   runs_valid_ = false;
 
   const Font& font = GetFont();
-  base::mac::ScopedCFTypeRef<CFStringRef> font_name_cf_string(
+  base::ScopedCFTypeRef<CFStringRef> font_name_cf_string(
       base::SysUTF8ToCFStringRef(font.GetFontName()));
-  base::mac::ScopedCFTypeRef<CTFontRef> ct_font(
+  base::ScopedCFTypeRef<CTFontRef> ct_font(
       CTFontCreateWithName(font_name_cf_string, font.GetFontSize(), NULL));
 
   const void* keys[] = { kCTFontAttributeName };
   const void* values[] = { ct_font };
-  base::mac::ScopedCFTypeRef<CFDictionaryRef> attributes(
-      CFDictionaryCreate(NULL, keys, values, arraysize(keys), NULL,
+  base::ScopedCFTypeRef<CFDictionaryRef> attributes(
+      CFDictionaryCreate(NULL,
+                         keys,
+                         values,
+                         arraysize(keys),
+                         NULL,
                          &kCFTypeDictionaryValueCallBacks));
 
-  base::mac::ScopedCFTypeRef<CFStringRef> cf_text(
+  base::ScopedCFTypeRef<CFStringRef> cf_text(
       base::SysUTF16ToCFStringRef(text()));
-  base::mac::ScopedCFTypeRef<CFAttributedStringRef> attr_text(
+  base::ScopedCFTypeRef<CFAttributedStringRef> attr_text(
       CFAttributedStringCreate(NULL, cf_text, attributes));
-  base::mac::ScopedCFTypeRef<CFMutableAttributedStringRef> attr_text_mutable(
+  base::ScopedCFTypeRef<CFMutableAttributedStringRef> attr_text_mutable(
       CFAttributedStringCreateMutableCopy(NULL, 0, attr_text));
 
   // TODO(asvitkine|msw): Respect GetTextDirection(), which may not match the
   // natural text direction. See kCTTypesetterOptionForcedEmbeddingLevel, etc.
 
   ApplyStyles(attr_text_mutable, ct_font);
   line_.reset(CTLineCreateWithAttributedString(attr_text_mutable));
 
   CGFloat ascent = 0;
   CGFloat descent = 0;
@@ skipping 50 matching lines @@
   // attribute objects do not leak, they are saved to |attributes_|.
   // Clear the attributes storage.
   attributes_.reset(CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks));
 
   // https://developer.apple.com/library/mac/#documentation/Carbon/Reference/CoreText_StringAttributes_Ref/Reference/reference.html
   internal::StyleIterator style(colors(), styles());
   const size_t layout_text_length = GetLayoutText().length();
   for (size_t i = 0, end = 0; i < layout_text_length; i = end) {
     end = TextIndexToLayoutIndex(style.GetRange().end());
     const CFRange range = CFRangeMake(i, end - i);
-    base::mac::ScopedCFTypeRef<CGColorRef> foreground(
+    base::ScopedCFTypeRef<CGColorRef> foreground(
         gfx::CGColorCreateFromSkColor(style.color()));
     CFAttributedStringSetAttribute(attr_string, range,
         kCTForegroundColorAttributeName, foreground);
     CFArrayAppendValue(attributes_, foreground);
 
     if (style.style(UNDERLINE)) {
       CTUnderlineStyle value = kCTUnderlineStyleSingle;
-      base::mac::ScopedCFTypeRef<CFNumberRef> underline_value(
+      base::ScopedCFTypeRef<CFNumberRef> underline_value(
           CFNumberCreate(NULL, kCFNumberSInt32Type, &value));
       CFAttributedStringSetAttribute(attr_string, range,
                                      kCTUnderlineStyleAttributeName,
                                      underline_value);
       CFArrayAppendValue(attributes_, underline_value);
     }
 
     const int traits = (style.style(BOLD) ? kCTFontBoldTrait : 0) |
                        (style.style(ITALIC) ? kCTFontItalicTrait : 0);
     if (traits != 0) {
-      base::mac::ScopedCFTypeRef<CTFontRef> styled_font(
+      base::ScopedCFTypeRef<CTFontRef> styled_font(
           CTFontCreateCopyWithSymbolicTraits(font, 0.0, NULL, traits, traits));
       // TODO(asvitkine): Handle |styled_font| == NULL case better.
       if (styled_font) {
         CFAttributedStringSetAttribute(attr_string, range, kCTFontAttributeName,
                                        styled_font);
         CFArrayAppendValue(attributes_, styled_font);
       }
     }
 
     style.UpdatePosition(LayoutIndexToTextIndex(end));
@@ skipping 60 matching lines @@
       point->set(x + SkDoubleToScalar(positions_ptr[glyph].x),
                  y + SkDoubleToScalar(positions_ptr[glyph].y));
     }
 
     // TODO(asvitkine): Style boundaries are not necessarily per-run. Handle
     //                  this better. Also, support strike and diagonal_strike.
     CFDictionaryRef attributes = CTRunGetAttributes(ct_run);
     CTFontRef ct_font =
         base::mac::GetValueFromDictionary<CTFontRef>(attributes,
                                                      kCTFontAttributeName);
-    base::mac::ScopedCFTypeRef<CFStringRef> font_name_ref(
+    base::ScopedCFTypeRef<CFStringRef> font_name_ref(
         CTFontCopyFamilyName(ct_font));
     run->font_name = base::SysCFStringRefToUTF8(font_name_ref);
     run->text_size = CTFontGetSize(ct_font);
 
     CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(ct_font);
     if (traits & kCTFontBoldTrait)
       run->font_style |= Font::BOLD;
     if (traits & kCTFontItalicTrait)
       run->font_style |= Font::ITALIC;
 
@@ skipping 13 matching lines @@
     run_origin.offset(run_width, 0);
   }
   runs_valid_ = true;
 }
 
 RenderText* RenderText::CreateInstance() {
   return new RenderTextMac;
 }
 
 }  // namespace gfx