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

webkit/tools/test_shell/test_shell_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 <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 #import <objc/objc-runtime.h>
 #include <sys/stat.h>
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "app/data_pack.h"
 #include "base/base_paths.h"
 #include "base/basictypes.h"
 #include "base/debug_on_start.h"
 #include "base/debug/debugger.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/memory_debug.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/size.h"
 #include "grit/webkit_resources.h"
 #include "net/base/mime_util.h"
 #include "skia/ext/bitmap_platform_device.h"
@@ skipping 42 matching lines @@
 static app::DataPack* g_resource_data_pack = NULL;
 
 // Define static member variables
 base::LazyInstance <std::map<gfx::NativeWindow, TestShell *> >
     TestShell::window_map_(base::LINKER_INITIALIZED);
 
 // Helper method for getting the path to the test shell resources directory.
 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");
   } else {
     PathService::Get(base::DIR_SOURCE_ROOT, &path);
     path = path.AppendASCII("webkit");
     path = path.AppendASCII("tools");
     path = path.AppendASCII("test_shell");
     return path.AppendASCII("resources");
   }
@@ skipping 111 matching lines @@
   layout_test_mode_ = layout_test_mode;
   allow_external_pages_ = allow_external_pages;
 
   web_prefs_ = new WebPreferences;
 
   // mmap the data pack which holds strings used by WebCore. This is only
   // a fatal error if we're bundled, which means we might be running layout
   // 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)) {
     LOG(FATAL) << "failed to load test_shell.pak";
   }
 
   ResetWebPreferences();
 
   // 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
     // ATSFontDeactivate to unload the font.  Since the font is only loaded
     // for this process, and it's always wanted, don't keep track of it.
     if (ATSFontActivateFromFileReference(&ahem_fsref,
                                          kATSFontContextLocal,
                                          kATSFontFormatUnspecified,
                                          NULL,
                                          kATSOptionFlagsDefault,
                                          NULL) != noErr) {
       DLOG(FATAL) << "ATSFontActivateFromFileReference " << ahem_path_c;
     }
   }
 
   // Add <app bundle's parent dir>/plugins to the plugin path so we can load
   // 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");
   }
   webkit::npapi::PluginList::Singleton()->AddExtraPluginDir(plugins_dir);
 }
 
 NSButton* MakeTestButton(NSRect* rect, NSString* title, NSView* parent) {
   NSButton* button = [[[NSButton alloc] initWithFrame:*rect] autorelease];
   [button setTitle:title];
@@ skipping 474 matching lines @@
   return false;
 }
 
 void DidLoadPlugin(const std::string& filename) {
 }
 
 void DidUnloadPlugin(const std::string& filename) {
 }
 
 }  // namespace webkit_glue