Index: webkit/support/platform_support_android.cc |
diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc |
index f6bf077361e80c3d6b352b6e780d0b39d960291b..30effc72ed625a3397bc475ecb942105cd639ac8 100644 |
--- a/webkit/support/platform_support_android.cc |
+++ b/webkit/support/platform_support_android.cc |
@@ -36,7 +36,7 @@ void BeforeInitialize(bool unit_test_mode) { |
base::InitAndroidTestPaths(); |
// Place cache under kDumpRenderTreeDir to allow the NRWT script to clear it. |
- FilePath path(kDumpRenderTreeDir); |
+ base::FilePath path(kDumpRenderTreeDir); |
path = path.Append("cache"); |
PathService::Override(base::DIR_CACHE, path); |
@@ -57,7 +57,7 @@ void BeforeInitialize(bool unit_test_mode) { |
} |
void AfterInitialize(bool unit_test_mode) { |
- FilePath data_path(kDumpRenderTreeDir); |
+ base::FilePath data_path(kDumpRenderTreeDir); |
data_path = data_path.Append("DumpRenderTree.pak"); |
ResourceBundle::InitSharedInstanceWithPakPath(data_path); |
@@ -96,13 +96,13 @@ string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) { |
base::StringPiece TestWebKitPlatformSupport::GetDataResource( |
int resource_id, |
ui::ScaleFactor scale_factor) { |
- FilePath resources_path(kDumpRenderTreeDir); |
+ base::FilePath resources_path(kDumpRenderTreeDir); |
resources_path = resources_path.Append("DumpRenderTree_resources"); |
switch (resource_id) { |
case IDR_BROKENIMAGE: { |
CR_DEFINE_STATIC_LOCAL(std::string, broken_image_data, ()); |
if (broken_image_data.empty()) { |
- FilePath path = resources_path.Append("missingImage.gif"); |
+ base::FilePath path = resources_path.Append("missingImage.gif"); |
bool success = file_util::ReadFileToString(path, &broken_image_data); |
if (!success) |
LOG(FATAL) << "Failed reading: " << path.value(); |
@@ -112,7 +112,7 @@ base::StringPiece TestWebKitPlatformSupport::GetDataResource( |
case IDR_TEXTAREA_RESIZER: { |
CR_DEFINE_STATIC_LOCAL(std::string, resize_corner_data, ()); |
if (resize_corner_data.empty()) { |
- FilePath path = resources_path.Append("textAreaResizeCorner.png"); |
+ base::FilePath path = resources_path.Append("textAreaResizeCorner.png"); |
bool success = file_util::ReadFileToString(path, &resize_corner_data); |
if (!success) |
LOG(FATAL) << "Failed reading: " << path.value(); |