Replace FilePath with base::FilePath in some more top level directories.

ui/surface/accelerated_surface_transformer_win_unittest.cc

Index: ui/surface/accelerated_surface_transformer_win_unittest.cc
diff --git a/ui/surface/accelerated_surface_transformer_win_unittest.cc b/ui/surface/accelerated_surface_transformer_win_unittest.cc
index ed5b606990e292d1f2e9467ecd1721212917e9bd..b8b1eb6bf90a736828aed2f1872ee4fa2fa144d1 100644
--- a/ui/surface/accelerated_surface_transformer_win_unittest.cc
+++ b/ui/surface/accelerated_surface_transformer_win_unittest.cc
@@ -69,7 +69,7 @@ SkBitmap ToSkBitmap(IDirect3DSurface9* surface, bool is_single_channel) {
   return result;
 }
 
-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,
@@ -552,15 +552,16 @@ bool AssertSameColor(uint8 color_a, uint8 color_b) {
       // extra columns added due to packing. That means up to 7 extra
       // columns for uv, and up to 3 extra columns for y.
       WritePNGFile(reference_rgb,
-                   FilePath(FILE_PATH_LITERAL("test_fail_src.png")));
+                   base::FilePath(FILE_PATH_LITERAL("test_fail_src.png")));
       WritePNGFile(reference_rgb_scaled,
-                   FilePath(FILE_PATH_LITERAL("test_fail_src_scaled.png")));
+                   base::FilePath(
+                       FILE_PATH_LITERAL("test_fail_src_scaled.png")));
       WritePNGFile(ToSkBitmap(dst_y, true),
-                   FilePath(FILE_PATH_LITERAL("test_fail_y.png")));
+                   base::FilePath(FILE_PATH_LITERAL("test_fail_y.png")));
       WritePNGFile(ToSkBitmap(dst_u, true),
-                   FilePath(FILE_PATH_LITERAL("test_fail_u.png")));
+                   base::FilePath(FILE_PATH_LITERAL("test_fail_u.png")));
       WritePNGFile(ToSkBitmap(dst_v, true),
-                   FilePath(FILE_PATH_LITERAL("test_fail_v.png")));
+                   base::FilePath(FILE_PATH_LITERAL("test_fail_v.png")));
     }
   }