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

gfx/scoped_image_unittest.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 "base/scoped_ptr.h"
 #include "gfx/scoped_image.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 #if defined(OS_LINUX)
 #include "gfx/gtk_util.h"
 #elif defined(OS_MACOSX)
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #include "skia/ext/skia_utils_mac.h"
 #endif
 
 namespace {
 
 class ScopedImageTest : public testing::Test {
  public:
   SkBitmap* CreateBitmap() {
     SkBitmap* bitmap = new SkBitmap();
     bitmap->setConfig(SkBitmap::kARGB_8888_Config, 25, 25);
     bitmap->allocPixels();
     bitmap->eraseRGB(255, 0, 0);
     return bitmap;
   }
 
   gfx::NativeImage CreateNativeImage() {
     scoped_ptr<SkBitmap> bitmap(CreateBitmap());
 #if defined(OS_MACOSX)
     NSImage* image = gfx::SkBitmapToNSImage(*(bitmap.get()));
-    mac_util::NSObjectRetain(image);
+    base::mac::NSObjectRetain(image);
     return image;
 #elif defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
     return gfx::GdkPixbufFromSkBitmap(bitmap.get());
 #else
     return bitmap.release();
 #endif
   }
 };
 
 TEST_F(ScopedImageTest, Initialize) {
@@ skipping 45 matching lines @@
 
 TEST_F(ScopedImageTest, NativeSet) {
   gfx::ScopedNativeImage image(CreateNativeImage());
   EXPECT_TRUE(image.Get());
   gfx::NativeImage image2 = CreateNativeImage();
   image.Set(image2);
   EXPECT_EQ(image2, image.Get());
 }
 
 }  // namespace