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

webkit/tools/test_shell/test_shell_mac.mm

Index: webkit/tools/test_shell/test_shell_mac.mm
===================================================================
--- webkit/tools/test_shell/test_shell_mac.mm	(revision 70358)
+++ webkit/tools/test_shell/test_shell_mac.mm	(working copy)
@@ -17,7 +17,7 @@
 #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/memory_debug.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ -80,7 +80,7 @@
 FilePath GetResourcesFilePath() {
   FilePath path;
   // We need to know if we're bundled or not to know which path to use.
-  if (mac_util::AmIBundled()) {
+  if (base::mac::AmIBundled()) {
     PathService::Get(base::DIR_EXE, &path);
     path = path.Append(FilePath::kParentDirectory);
     return path.AppendASCII("Resources");
@@ -212,7 +212,7 @@
   // tests. This is a harmless failure for test_shell_tests.
   g_resource_data_pack = new app::DataPack;
   NSString *resource_path =
-      [mac_util::MainAppBundle() pathForResource:@"test_shell"
+      [base::mac::MainAppBundle() pathForResource:@"test_shell"
                                           ofType:@"pak"];
   FilePath resources_pak_path([resource_path fileSystemRepresentation]);
   if (!g_resource_data_pack->Load(resources_pak_path)) {
@@ -223,11 +223,11 @@
 
   // Load the Ahem font, which is used by layout tests.
   const char* ahem_path_c;
-  NSString* ahem_path = [[mac_util::MainAppBundle() resourcePath]
+  NSString* ahem_path = [[base::mac::MainAppBundle() resourcePath]
       stringByAppendingPathComponent:@"AHEM____.TTF"];
   ahem_path_c = [ahem_path fileSystemRepresentation];
   FSRef ahem_fsref;
-  if (!mac_util::FSRefFromPath(ahem_path_c, &ahem_fsref)) {
+  if (!base::mac::FSRefFromPath(ahem_path_c, &ahem_fsref)) {
     DLOG(FATAL) << "FSRefFromPath " << ahem_path_c;
   } else {
     // The last argument is an ATSFontContainerRef that can be passed to
@@ -247,7 +247,7 @@
   // test plugins.
   FilePath plugins_dir;
   PathService::Get(base::DIR_EXE, &plugins_dir);
-  if (mac_util::AmIBundled()) {
+  if (base::mac::AmIBundled()) {
     plugins_dir = plugins_dir.AppendASCII("../../../plugins");
   } else {
     plugins_dir = plugins_dir.AppendASCII("plugins");