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

ui/gfx/image/image_unittest_util.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.
 
 // Because the unit tests for gfx::Image are spread across multiple
 // implementation files, this header contains the reusable components.
 
 #include "ui/gfx/image/image_unittest_util.h"
 
 #include <cmath>
@@ skipping 168 matching lines @@
   return bmp.isNull() ||
          (bmp.width() == 0 && bmp.height() == 0);
 }
 
 PlatformImage CreatePlatformImage() {
   const SkBitmap bitmap(CreateBitmap(25, 25));
 #if defined(OS_IOS)
   ui::ScaleFactor scale_factor = ui::GetMaxScaleFactor();
   float scale = ui::GetScaleFactorScale(scale_factor);
 
-  base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space(
+  base::ScopedCFTypeRef<CGColorSpaceRef> color_space(
       CGColorSpaceCreateDeviceRGB());
   UIImage* image =
       gfx::SkBitmapToUIImageWithColorSpace(bitmap, scale, color_space);
   base::mac::NSObjectRetain(image);
   return image;
 #elif defined(OS_MACOSX)
   NSImage* image = gfx::SkBitmapToNSImage(bitmap);
   base::mac::NSObjectRetain(image);
   return image;
 #elif defined(TOOLKIT_GTK)
@@ skipping 78 matching lines @@
 bool PlatformImagesEqual(PlatformImage image1, PlatformImage image2) {
 #if defined(OS_MACOSX) || defined(TOOLKIT_GTK)
   return image1 == image2;
 #else
   return image1.BackedBySameObjectAs(image2);
 #endif
 }
 
 }  // namespace test
 }  // namespace gfx