3 files changed, 8 insertions, 8 deletions
diff --git a/cc/test/paths.cc b/cc/test/paths.cc
index a8f2e2f..b921cca 100644
--- a/cc/test/paths.cc
+++ b/cc/test/paths.cc
@@ -10,8 +10,8 @@
 
 namespace cc {
 
-bool PathProvider(int key, FilePath* result) {
-  FilePath cur;
+bool PathProvider(int key, base::FilePath* result) {
+  base::FilePath cur;
   switch (key) {
     // The following are only valid in the development environment, and
     // will fail if executed from an installed executable (because the
diff --git a/cc/test/pixel_test_utils.cc b/cc/test/pixel_test_utils.cc
index dbb1191..d1101b3 100644
--- a/cc/test/pixel_test_utils.cc
+++ b/cc/test/pixel_test_utils.cc
@@ -11,7 +11,7 @@
 
 namespace cc {
 
-bool WritePNGFile(const SkBitmap& bitmap, const FilePath& file_path) {
+bool WritePNGFile(const SkBitmap& bitmap, const base::FilePath& file_path) {
   std::vector<unsigned char> png_data;
   const bool discard_transparency = true;
   if (gfx::PNGCodec::EncodeBGRASkBitmap(bitmap,
@@ -25,7 +25,7 @@ bool WritePNGFile(const SkBitmap& bitmap, const FilePath& file_path) {
   return false;
 }
 
-bool ReadPNGFile(const FilePath& file_path, SkBitmap* bitmap) {
+bool ReadPNGFile(const base::FilePath& file_path, SkBitmap* bitmap) {
   DCHECK(bitmap);
   std::string png_data;
   return file_util::ReadFileToString(file_path, &png_data) &&
@@ -34,7 +34,7 @@ bool ReadPNGFile(const FilePath& file_path, SkBitmap* bitmap) {
                                bitmap);
 }
 
-bool IsSameAsPNGFile(const SkBitmap& gen_bmp, FilePath ref_img_path) {
+bool IsSameAsPNGFile(const SkBitmap& gen_bmp, base::FilePath ref_img_path) {
   SkBitmap ref_bmp;
   if (!ReadPNGFile(ref_img_path, &ref_bmp)) {
     LOG(ERROR) << "Cannot read reference image: " << ref_img_path.value();
diff --git a/cc/test/pixel_test_utils.h b/cc/test/pixel_test_utils.h
index 3fa990d6..5f8db47 100644
--- a/cc/test/pixel_test_utils.h
+++ b/cc/test/pixel_test_utils.h
@@ -13,15 +13,15 @@ namespace cc {
 
 // Encodes a bitmap into a PNG and write to disk. Returns true on success. The
 // parent directory does not have to exist.
-bool WritePNGFile(const SkBitmap& bitmap, const FilePath& file_path);
+bool WritePNGFile(const SkBitmap& bitmap, const base::FilePath& file_path);
 
 // Reads and decodes a PNG image to a bitmap. Returns true on success. The PNG
 // should have been encoded using |gfx::PNGCodec::Encode|.
-bool ReadPNGFile(const FilePath& file_path, SkBitmap* bitmap);
+bool ReadPNGFile(const base::FilePath& file_path, SkBitmap* bitmap);
 
 // Compares with a PNG file on disk, and returns true if it is the same as
 // the given image. |ref_img_path| is absolute.
-bool IsSameAsPNGFile(const SkBitmap& gen_bmp, FilePath ref_img_path);
+bool IsSameAsPNGFile(const SkBitmap& gen_bmp, base::FilePath ref_img_path);
 
 }  // namespace cc