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

chrome/common/font_loader_mac.mm

 // 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 "chrome/common/font_loader_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 
 // static
 bool FontLoader::LoadFontIntoBuffer(NSFont* font_to_encode,
                                     base::SharedMemory* font_data,
                                     uint32* font_data_size) {
   CHECK(font_data && font_data_size);
   *font_data_size = 0;
 
   // Used only for logging.
@@ skipping 19 matching lines @@
   // CreateCGFontFromBuffer() is called in the same process as this function
   // e.g. when writing a unit test that exercises these two functions together.
   // If said unit test were to load a system font and activate it from memory
   // it becomes impossible for the system to the find the original file ref
   // since the font now lives in memory as far as it's concerned.
   FSRef font_fsref;
   if (ATSFontGetFileReference(ats_font, &font_fsref) != noErr) {
     LOG(ERROR) << "Failed to find font file for " << font_name;
     return false;
   }
-  FilePath font_path = FilePath(mac_util::PathFromFSRef(font_fsref));
+  FilePath font_path = FilePath(base::mac::PathFromFSRef(font_fsref));
 
   // Load file into shared memory buffer.
   int64 font_file_size_64 = -1;
   if (!file_util::GetFileSize(font_path, &font_file_size_64)) {
     LOG(ERROR) << "Couldn't get font file size for " << font_path.value();
     return false;
   }
 
   if (font_file_size_64 <= 0 || font_file_size_64 >= kint32max) {
     LOG(ERROR) << "Bad size for font file " << font_path.value();
@@ skipping 37 matching lines @@
   // This is the value used by WebKit when activating remote fonts.
   const ATSFontContext kFontContextPrivate = 3;
   OSStatus err = ATSFontActivateFromMemory(shm.memory(), font_data_size,
                     kFontContextPrivate, kATSFontFormatUnspecified, NULL,
                     kATSOptionFlagsDefault, font_container);
   if (err != noErr || !font_container)
     return false;
 
   return true;
 }