4 files changed, 14 insertions, 14 deletions
diff --git a/media/base/media_posix.cc b/media/base/media_posix.cc
index 724e113..34a5811 100644
--- a/media/base/media_posix.cc
+++ b/media/base/media_posix.cc
@@ -37,11 +37,11 @@ namespace media {
 #if defined(OS_MACOSX)
 // TODO(evan): should be using .so like ffmepgsumo here.
 #define DSO_NAME(MODULE, VERSION) ("lib" MODULE "." VERSION ".dylib")
-static const FilePath::CharType kSumoLib[] =
+static const base::FilePath::CharType kSumoLib[] =
     FILE_PATH_LITERAL("ffmpegsumo.so");
 #elif defined(OS_POSIX)
 #define DSO_NAME(MODULE, VERSION) ("lib" MODULE ".so." VERSION)
-static const FilePath::CharType kSumoLib[] =
+static const base::FilePath::CharType kSumoLib[] =
     FILE_PATH_LITERAL("libffmpegsumo.so");
 #else
 #error "Do not know how to construct DSO name for this OS."
@@ -52,7 +52,7 @@ static const FilePath::CharType kSumoLib[] =
 // guarantee this is only set once in a thread safe manner.
 static bool g_media_library_is_initialized = false;
 
-static bool InitializeMediaLibraryInternal(const FilePath& module_dir) {
+static bool InitializeMediaLibraryInternal(const base::FilePath& module_dir) {
   DCHECK(!g_media_library_is_initialized);
 
 #if defined(USE_SYSTEM_FFMPEG)
@@ -79,7 +79,7 @@ static bool InitializeMediaLibraryInternal(const FilePath& module_dir) {
   return g_media_library_is_initialized;
 }
 
-bool InitializeMediaLibrary(const FilePath& base_path) {
+bool InitializeMediaLibrary(const base::FilePath& base_path) {
   static const bool kMediaLibraryInitialized =
       InitializeMediaLibraryInternal(base_path);
   DCHECK_EQ(kMediaLibraryInitialized, g_media_library_is_initialized);
@@ -87,7 +87,7 @@ bool InitializeMediaLibrary(const FilePath& base_path) {
 }
 
 void InitializeMediaLibraryForTesting() {
-  FilePath file_path;
+  base::FilePath file_path;
   CHECK(PathService::Get(base::DIR_EXE, &file_path));
   CHECK(InitializeMediaLibrary(file_path));
 }
diff --git a/media/base/media_win.cc b/media/base/media_win.cc
index 616d370..cc80089 100644
--- a/media/base/media_win.cc
+++ b/media/base/media_win.cc
@@ -28,7 +28,7 @@ static const char* kFFmpegDLL = "ffmpegsumo.dll";
 // guarantee this is only set once in a thread safe manner.
 static bool g_media_library_is_initialized = false;
 
-static bool InitializeMediaLibraryInternal(const FilePath& base_path) {
+static bool InitializeMediaLibraryInternal(const base::FilePath& base_path) {
   DCHECK(!g_media_library_is_initialized);
 
   // LoadLibraryEx(..., LOAD_WITH_ALTERED_SEARCH_PATH) cannot handle
@@ -47,7 +47,7 @@ static bool InitializeMediaLibraryInternal(const FilePath& base_path) {
   return g_media_library_is_initialized;
 }
 
-bool InitializeMediaLibrary(const FilePath& base_path) {
+bool InitializeMediaLibrary(const base::FilePath& base_path) {
   static const bool kMediaLibraryInitialized =
       InitializeMediaLibraryInternal(base_path);
   DCHECK_EQ(kMediaLibraryInitialized, g_media_library_is_initialized);
@@ -55,7 +55,7 @@ bool InitializeMediaLibrary(const FilePath& base_path) {
 }
 
 void InitializeMediaLibraryForTesting() {
-  FilePath file_path;
+  base::FilePath file_path;
   CHECK(PathService::Get(base::DIR_EXE, &file_path));
   CHECK(InitializeMediaLibrary(file_path));
 }
diff --git a/media/base/test_data_util.cc b/media/base/test_data_util.cc
index 134655d..e84fdaf 100644
--- a/media/base/test_data_util.cc
+++ b/media/base/test_data_util.cc
@@ -12,7 +12,7 @@
 namespace media {
 
 FilePath GetTestDataFilePath(const std::string& name) {
-  FilePath file_path;
+  base::FilePath file_path;
   CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &file_path));
 
   file_path = file_path.Append(FILE_PATH_LITERAL("media"))
@@ -23,7 +23,7 @@ FilePath GetTestDataFilePath(const std::string& name) {
 }
 
 scoped_refptr<DecoderBuffer> ReadTestDataFile(const std::string& name) {
-  FilePath file_path;
+  base::FilePath file_path;
   CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &file_path));
 
   file_path = file_path.Append(FILE_PATH_LITERAL("media"))
diff --git a/media/base/yuv_convert_unittest.cc b/media/base/yuv_convert_unittest.cc
index c2647e7..e88ca9f 100644
--- a/media/base/yuv_convert_unittest.cc
+++ b/media/base/yuv_convert_unittest.cc
@@ -37,12 +37,12 @@ static const int kRGB24Size = kSourceYSize * 3;
 static const int kRGBSizeConverted = kSourceYSize * kBpp;
 
 // Helper for reading test data into a scoped_array<uint8>.
-static void ReadData(const FilePath::CharType* filename,
+static void ReadData(const base::FilePath::CharType* filename,
                      int expected_size,
                      scoped_array<uint8>* data) {
   data->reset(new uint8[expected_size]);
 
-  FilePath path;
+  base::FilePath path;
   CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &path));
   path = path.Append(FILE_PATH_LITERAL("media"))
              .Append(FILE_PATH_LITERAL("test"))
@@ -337,7 +337,7 @@ TEST(YUVConvertTest, RGB32ToYUV) {
   scoped_array<uint8> rgb_converted_bytes(new uint8[kRGBSize]);
 
   // Read YUV reference data from file.
-  FilePath yuv_url;
+  base::FilePath yuv_url;
   EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &yuv_url));
   yuv_url = yuv_url.Append(FILE_PATH_LITERAL("media"))
                    .Append(FILE_PATH_LITERAL("test"))
@@ -415,7 +415,7 @@ TEST(YUVConvertTest, YUY2ToYUV) {
 
 TEST(YUVConvertTest, DownScaleYUVToRGB32WithRect) {
   // Read YUV reference data from file.
-  FilePath yuv_url;
+  base::FilePath yuv_url;
   EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &yuv_url));
   yuv_url = yuv_url.Append(FILE_PATH_LITERAL("media"))
                    .Append(FILE_PATH_LITERAL("test"))