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

base/base_paths_mac.mm

 // Copyright (c) 2006-2008 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/base_paths_mac.h"
 
 #import <Foundation/Foundation.h>
 #include <mach-o/dyld.h>
 
 #include "base/compiler_specific.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/path_service.h"
 #include "base/string_util.h"
 
 namespace {
 
 bool GetNSExecutablePath(FilePath* path) WARN_UNUSED_RESULT;
 
 bool GetNSExecutablePath(FilePath* path) {
   DCHECK(path);
   // Executable path can have relative references ("..") depending on
@@ skipping 16 matching lines @@
 
 namespace base {
 
 bool PathProviderMac(int key, FilePath* result) {
   switch (key) {
     case base::FILE_EXE:
     case base::FILE_MODULE: {
       return GetNSExecutablePath(result);
     }
     case base::DIR_CACHE:
-      return mac_util::GetUserDirectory(NSCachesDirectory, result);
+      return base::mac::GetUserDirectory(NSCachesDirectory, result);
     case base::DIR_APP_DATA:
-      return mac_util::GetUserDirectory(NSApplicationSupportDirectory, result);
+      return base::mac::GetUserDirectory(NSApplicationSupportDirectory, result);
     case base::DIR_SOURCE_ROOT: {
       // Go through PathService to catch overrides.
       if (PathService::Get(base::FILE_EXE, result)) {
         // Start with the executable's directory.
         *result = result->DirName();
-        if (mac_util::AmIBundled()) {
+        if (base::mac::AmIBundled()) {
           // The bundled app executables (Chromium, TestShell, etc) live five
           // levels down, eg:
           // src/xcodebuild/{Debug|Release}/Chromium.app/Contents/MacOS/Chromium
           *result = result->DirName().DirName().DirName().DirName().DirName();
         } else {
           // Unit tests execute two levels deep from the source root, eg:
           // src/xcodebuild/{Debug|Release}/base_unittests
           *result = result->DirName().DirName();
         }
       }
       return true;
     }
     default:
       return false;
   }
 }
 
 }  // namespace base