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

gfx/scoped_image.h

 // 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.
 
 #ifndef GFX_SCOPED_IMAGE_H_
 #define GFX_SCOPED_IMAGE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "build/build_config.h"
 #include "gfx/native_widget_types.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 #if defined(OS_LINUX)
 #include <glib-object.h>
 #elif defined(OS_MACOSX)
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #endif
 
 namespace gfx {
 
 namespace internal {
 
 // ScopedImage is class that encapsulates one of the three platform-specific
 // images used: SkBitmap, NSImage, and GdkPixbuf. This is the abstract interface
 // that all ScopedImages respond to. This wrapper expects to own the image it
 // holds, unless it is Release()ed or Free()ed.
@@ skipping 71 matching lines @@
 template <>
 class ScopedImage<NSImage> : public gfx::internal::ScopedImage<NSImage> {
  public:
   explicit ScopedImage(NSImage* image)
       : gfx::internal::ScopedImage<NSImage>(image) {}
   virtual ~ScopedImage() {
     Free();
   }
 
   virtual void Free() {
-    mac_util::NSObjectRelease(image_);
+    base::mac::NSObjectRelease(image_);
     image_ = NULL;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedImage);
 };
 #endif  // defined(OS_MACOSX)
 
 // Specialization for the GdkPixbuf type on Linux.
 #if defined(OS_LINUX)
@@ skipping 18 matching lines @@
 };
 #endif  // defined(OS_LINUX)
 
 // Typedef ScopedNativeImage to the default template argument. This allows for
 // easy exchange between gfx::NativeImage and a gfx::ScopedNativeImage.
 typedef ScopedImage<> ScopedNativeImage;
 
 }  // namespace gfx
 
 #endif  // GFX_SCOPED_IMAGE_H_