Add a macutil for the main app bundle and override...

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"
@@ skipping 162 matching lines @@
 
   window_list_ = new WindowList;
   layout_test_mode_ = layout_test_mode;
   
   web_prefs_ = new WebPreferences;
   
   ResetWebPreferences();
 
   // Load the Ahem font, which is used by layout tests.
   const char* ahem_path_c;
-  FilePath ahem_path;  // Ensure ahem_path_c storage is not freed too soon.
-  if (mac_util::AmIBundled()) {
-    // When bundled (in TestShell.app), expect to find the font in
-    // Contents/Resources.
-    NSString* ahem_path = [[[NSBundle mainBundle] resourcePath]
-        stringByAppendingPathComponent:@"AHEM____.TTF"];
-    ahem_path_c = [ahem_path fileSystemRepresentation];
-  } else {
-    // When not bundled (in test_shell_tests), look in the source tree for
-    // the font.
-    PathService::Get(base::DIR_SOURCE_ROOT, &ahem_path);
-    ahem_path = ahem_path.Append("webkit");
-    ahem_path = ahem_path.Append("tools");
-    ahem_path = ahem_path.Append("test_shell");
-    ahem_path = ahem_path.Append("resources");
-    ahem_path = ahem_path.Append("AHEM____.TTF");
-
-    ahem_path_c = ahem_path.value().c_str();
-  }
-
+  NSString* ahem_path = [[mac_util::MainAppBundle() resourcePath]
+      stringByAppendingPathComponent:@"AHEM____.TTF"];
+  ahem_path_c = [ahem_path fileSystemRepresentation];
   FSRef ahem_fsref;
   if (!mac_util::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,
@@ skipping 482 matching lines @@
   return false;
 }
 
 void DidLoadPlugin(const std::string& filename) {
 }
 
 void DidUnloadPlugin(const std::string& filename) {
 }
 
 }  // namespace webkit_glue