diff options
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/platform_support_mac.mm | 6 | ||||
| -rw-r--r-- | webkit/support/test_webkit_client.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm index 0e9000f..55abee1 100644 --- a/webkit/support/platform_support_mac.mm +++ b/webkit/support/platform_support_mac.mm @@ -12,7 +12,7 @@ #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" @@ -104,7 +104,7 @@ void AfterInitialize(bool unit_test_mode) { // 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)) { @@ -177,7 +177,7 @@ string16 GetLocalizedString(int message_id) { 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); diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc index 0360d29..1a78768 100644 --- a/webkit/support/test_webkit_client.cc +++ b/webkit/support/test_webkit_client.cc @@ -57,7 +57,7 @@ #elif defined(OS_LINUX) #include "third_party/WebKit/WebKit/chromium/public/linux/WebThemeEngine.h" #elif defined(OS_MACOSX) -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #endif using WebKit::WebScriptController; @@ -88,7 +88,7 @@ TestWebKitClient::TestWebKitClient(bool unit_test_mode) FilePath module_path; if (PathService::Get(base::DIR_MODULE, &module_path)) { #if defined(OS_MACOSX) - if (mac_util::AmIBundled()) + if (base::mac::AmIBundled()) module_path = module_path.DirName().DirName().DirName(); #endif if (media::InitializeMediaLibrary(module_path)) |