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

webkit/support/platform_support_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 "webkit/support/platform_support.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 #import <objc/objc-runtime.h>
 
 #include "app/data_pack.h"
 #include "base/base_paths.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/string16.h"
 #include "grit/webkit_resources.h"
 #include "third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #import "webkit/support/drt_application_mac.h"
 #import "webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h"
 
 static app::DataPack* g_resource_data_pack = NULL;
 
@@ skipping 71 matching lines @@
 #endif
 }
 
 void AfterInitialize(bool unit_test_mode) {
   if (unit_test_mode)
     return;  // We don't have a resource pack when running the unit-tests.
 
   // Load a data pack.
   g_resource_data_pack = new app::DataPack;
   NSString* resource_path =
-      [mac_util::MainAppBundle() pathForResource:@"DumpRenderTree"
+      [base::mac::MainAppBundle() pathForResource:@"DumpRenderTree"
                                           ofType:@"pak"];
   FilePath resources_pak_path([resource_path fileSystemRepresentation]);
   if (!g_resource_data_pack->Load(resources_pak_path)) {
     LOG(FATAL) << "failed to load DumpRenderTree.pak";
   }
 
   // Load font files in the resource folder.
   static const char* const fontFileNames[] = {
       "AHEM____.TTF",
       "WebKitWeightWatcher100.ttf",
@@ skipping 52 matching lines @@
     LOG(FATAL) << "failed to load webkit string with id " << message_id;
   }
   return string16(reinterpret_cast<const char16*>(res.data()),
                   res.length() / 2);
 }
 
 // Helper method for getting the path to the test shell resources directory.
 static FilePath GetResourcesFilePath() {
   FilePath path;
   // We assume the application is bundled.
-  if (!mac_util::AmIBundled()) {
+  if (!base::mac::AmIBundled()) {
     LOG(FATAL) << "Failed to locate resources. The applicaiton is not bundled.";
   }
   PathService::Get(base::DIR_EXE, &path);
   path = path.Append(FilePath::kParentDirectory);
   return path.AppendASCII("Resources");
 }
 
 base::StringPiece GetDataResource(int resource_id) {
   switch (resource_id) {
   case IDR_BROKENIMAGE: {
@@ skipping 43 matching lines @@
     return res;
   }
 
   default:
     break;
   }
   return base::StringPiece();
 }
 
 }  // namespace webkit_glue