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

printing/image.cc

 // Copyright (c) 2009 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 "printing/image.h"
 
 #include "base/file_util.h"
 #include "base/md5.h"
 #include "base/string_number_conversions.h"
 #include "gfx/codec/png_codec.h"
 #include "gfx/rect.h"
 #include "skia/ext/platform_device.h"
 
 #if defined(OS_WIN)
 #include "gfx/gdi_util.h"  // EMF support
 #elif defined(OS_MACOSX)
 #include <ApplicationServices/ApplicationServices.h>
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #endif
 
 namespace {
 
 // A simple class which temporarily overrides system settings.
 // The bitmap image rendered via the PlayEnhMetaFile() function depends on
 // some system settings.
 // As a workaround for such dependency, this class saves the system settings
 // and changes them. This class also restore the saved settings in its
 // destructor.
@@ skipping 207 matching lines @@
 #elif defined(OS_MACOSX)
   // The printing system uses single-page metafiles (page indexes are 1-based).
   const unsigned int page_number = 1;
   gfx::Rect rect(metafile.GetPageBounds(page_number));
   if (rect.width() > 0 && rect.height() > 0) {
     size_ = rect.size();
     row_length_ = size_.width() * sizeof(uint32);
     size_t bytes = row_length_ * size_.height();
     DCHECK(bytes);
     data_.resize(bytes);
-    scoped_cftyperef<CGColorSpaceRef> color_space(
+    base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space(
         CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
-    scoped_cftyperef<CGContextRef> bitmap_context(
+    base::mac::ScopedCFTypeRef<CGContextRef> bitmap_context(
         CGBitmapContextCreate(&*data_.begin(), size_.width(), size_.height(),
                               8, row_length_, color_space,
                               kCGImageAlphaPremultipliedLast));
     DCHECK(bitmap_context.get());
     metafile.RenderPage(page_number, bitmap_context,
                         CGRectMake(0, 0, size_.width(), size_.height()),
                         true, false, false, false);
   }
 #else
   NOTIMPLEMENTED();
 #endif
 
   return false;
 }
 
 }  // namespace printing