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

media/filters/file_data_source_unittest.cc

Index: media/filters/file_data_source_unittest.cc
diff --git a/media/filters/file_data_source_unittest.cc b/media/filters/file_data_source_unittest.cc
index d7eaad04fdb82ce479322d9d95e80591eb985727..a840995161397afc9f4bc04d1a3cf19d43db16ea 100644
--- a/media/filters/file_data_source_unittest.cc
+++ b/media/filters/file_data_source_unittest.cc
@@ -33,9 +33,9 @@ class ReadCBHandler {
 // under the media/test/data directory.  Under Windows, strings for the
 // FilePath class are unicode, and the pipeline wants char strings.  Convert
 // the string to UTF8 under Windows.  For Mac and Linux, file paths are already
-// chars so just return the string from the FilePath.
+// chars so just return the string from the base::FilePath.
 FilePath TestFileURL() {
-  FilePath data_dir;
+  base::FilePath data_dir;
   EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &data_dir));
   data_dir = data_dir.Append(FILE_PATH_LITERAL("media"))
                      .Append(FILE_PATH_LITERAL("test"))