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

This CL was created fully mechanically by running

  git grep -l base::mac::ScopedCFTypeRef | xargs sed -i -e 's/base::mac::ScopedCFTypeRef/base::ScopedCFTypeRef/g'
  git commit -a -m.
  git clang-format HEAD^ --style=Chromium
  git commit -a -m.
  git cl upload -t $TITLE

BUG=251957
TBR=mark@chromium.org

Review URL: https://codereview.chromium.org/16917011

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

4 files changed, 16 insertions, 12 deletions

diff --git a/printing/image_mac.cc b/printing/image_mac.cc
index 7d45178..2ec9ef6 100644
--- a/printing/image_mac.cc
+++ b/printing/image_mac.cc
@@ -25,11 +25,15 @@ bool Image::LoadMetafile(const Metafile& metafile) {
   DCHECK(bytes);
 
   data_.resize(bytes);
-  base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space(
+  base::ScopedCFTypeRef<CGColorSpaceRef> color_space(
       CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
-  base::mac::ScopedCFTypeRef<CGContextRef> bitmap_context(
-      CGBitmapContextCreate(&*data_.begin(), size_.width(), size_.height(),
-                            8, row_length_, color_space,
+  base::ScopedCFTypeRef<CGContextRef> bitmap_context(
+      CGBitmapContextCreate(&*data_.begin(),
+                            size_.width(),
+                            size_.height(),
+                            8,
+                            row_length_,
+                            color_space,
                             kCGImageAlphaPremultipliedLast));
   DCHECK(bitmap_context.get());
 
diff --git a/printing/pdf_metafile_cg_mac.cc b/printing/pdf_metafile_cg_mac.cc
index e11ad08..cd7c5c7e 100644
--- a/printing/pdf_metafile_cg_mac.cc
+++ b/printing/pdf_metafile_cg_mac.cc
@@ -16,7 +16,7 @@
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
-using base::mac::ScopedCFTypeRef;
+using base::ScopedCFTypeRef;
 
 namespace {
 
diff --git a/printing/pdf_metafile_cg_mac.h b/printing/pdf_metafile_cg_mac.h
index f4dd81a..77f7031 100644
--- a/printing/pdf_metafile_cg_mac.h
+++ b/printing/pdf_metafile_cg_mac.h
@@ -71,13 +71,13 @@ class PRINTING_EXPORT PdfMetafileCg : public Metafile {
   base::ThreadChecker thread_checker_;
 
   // Context for rendering to the pdf.
-  base::mac::ScopedCFTypeRef<CGContextRef> context_;
+  base::ScopedCFTypeRef<CGContextRef> context_;
 
   // PDF backing store.
-  base::mac::ScopedCFTypeRef<CFMutableDataRef> pdf_data_;
+  base::ScopedCFTypeRef<CFMutableDataRef> pdf_data_;
 
   // Lazily-created CGPDFDocument representation of pdf_data_.
-  mutable base::mac::ScopedCFTypeRef<CGPDFDocumentRef> pdf_doc_;
+  mutable base::ScopedCFTypeRef<CGPDFDocumentRef> pdf_doc_;
 
   // Whether or not a page is currently open.
   bool page_is_open_;
diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm
index 407406c..4d83c13 100644
--- a/printing/printing_context_mac.mm
+++ b/printing/printing_context_mac.mm
@@ -214,7 +214,7 @@ bool PrintingContextMac::SetPrinter(const std::string& device_name) {
   if (!current_printer_id)
     return false;
 
-  base::mac::ScopedCFTypeRef<CFStringRef> new_printer_id(
+  base::ScopedCFTypeRef<CFStringRef> new_printer_id(
       base::SysUTF8ToCFStringRef(device_name));
   if (!new_printer_id.get())
     return false;
@@ -385,9 +385,9 @@ bool PrintingContextMac::SetOutputColor(int color_mode) {
   std::string color_setting_name;
   std::string color_value;
   GetColorModelForMode(color_mode, &color_setting_name, &color_value);
-  base::mac::ScopedCFTypeRef<CFStringRef> color_setting(
+  base::ScopedCFTypeRef<CFStringRef> color_setting(
       base::SysUTF8ToCFStringRef(color_setting_name));
-  base::mac::ScopedCFTypeRef<CFStringRef> output_color(
+  base::ScopedCFTypeRef<CFStringRef> output_color(
       base::SysUTF8ToCFStringRef(color_value));
 
   return PMPrintSettingsSetValue(pmPrintSettings,
@@ -432,7 +432,7 @@ PrintingContext::Result PrintingContextMac::NewDocument(
   PMPageFormat page_format =
       static_cast<PMPageFormat>([print_info_.get() PMPageFormat]);
 
-  base::mac::ScopedCFTypeRef<CFStringRef> job_title(
+  base::ScopedCFTypeRef<CFStringRef> job_title(
       base::SysUTF16ToCFStringRef(document_name));
   PMPrintSettingsSetJobName(print_settings, job_title.get());