Move base/mac_util.h to base/mac and use the base::mac namespace....

skia/ext/bitmap_platform_device_mac.cc

 // 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.
 
 #include "skia/ext/bitmap_platform_device_mac.h"
 
 #include <time.h>
 
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #include "base/ref_counted.h"
 #include "skia/ext/bitmap_platform_device_data.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "third_party/skia/include/core/SkTypes.h"
 #include "third_party/skia/include/core/SkUtils.h"
 
 namespace skia {
 
 namespace {
 
 static CGContextRef CGContextForData(void* data, int width, int height) {
 #define HAS_ARGB_SHIFTS(a, r, g, b) \
             (SK_A32_SHIFT == (a) && SK_R32_SHIFT == (r) \
              && SK_G32_SHIFT == (g) && SK_B32_SHIFT == (b))
 #if defined(SK_CPU_LENDIAN) && HAS_ARGB_SHIFTS(24, 16, 8, 0)
   // Allocate a bitmap context with 4 components per pixel (BGRA).  Apple
   // recommends these flags for improved CG performance.
   CGContextRef context =
       CGBitmapContextCreate(data, width, height, 8, width * 4,
-                            mac_util::GetSystemColorSpace(),
+                            base::mac::GetSystemColorSpace(),
                             kCGImageAlphaPremultipliedFirst |
                                 kCGBitmapByteOrder32Host);
 #else
 #error We require that Skia's and CoreGraphics's recommended \
        image memory layout match.
 #endif
 #undef HAS_ARGB_SHIFTS
 
   if (!context)
     return NULL;
@@ skipping 212 matching lines @@
   SkAutoLockPixels lock(bitmap);
   uint32_t* data = bitmap.getAddr32(0, 0);
   return static_cast<SkColor>(data[x + y * width()]);
 }
 
 void BitmapPlatformDevice::onAccessBitmap(SkBitmap*) {
   // Not needed in CoreGraphics
 }
 
 }  // namespace skia