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

Review URL: https://codereview.chromium.org/12217101

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181640 0039d316-1c4b-4281-b951-d872f2087c98

28 files changed, 54 insertions, 52 deletions

diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc
index 463321a..713ccc4 100644
--- a/media/audio/audio_low_latency_input_output_unittest.cc
+++ b/media/audio/audio_low_latency_input_output_unittest.cc
@@ -154,7 +154,7 @@ class FullDuplexAudioSinkSource
   virtual ~FullDuplexAudioSinkSource() {
     // Get complete file path to output file in the directory containing
     // media_unittests.exe. Example: src/build/Debug/audio_delay_values_ms.txt.
-    FilePath file_name;
+    base::FilePath file_name;
     EXPECT_TRUE(PathService::Get(base::DIR_EXE, &file_name));
     file_name = file_name.AppendASCII(kDelayValuesFileName);
 
diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc
index 53c0711..ff6cbbd 100644
--- a/media/audio/linux/audio_manager_linux.cc
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -92,14 +92,14 @@ void AudioManagerLinux::ShowAudioInputSettings() {
   CommandLine command_line(CommandLine::NO_PROGRAM);
   switch (base::nix::GetDesktopEnvironment(env.get())) {
     case base::nix::DESKTOP_ENVIRONMENT_GNOME:
-      command_line.SetProgram(FilePath("gnome-volume-control"));
+      command_line.SetProgram(base::FilePath("gnome-volume-control"));
       break;
     case base::nix::DESKTOP_ENVIRONMENT_KDE3:
     case base::nix::DESKTOP_ENVIRONMENT_KDE4:
-      command_line.SetProgram(FilePath("kmix"));
+      command_line.SetProgram(base::FilePath("kmix"));
       break;
     case base::nix::DESKTOP_ENVIRONMENT_UNITY:
-      command_line.SetProgram(FilePath("gnome-control-center"));
+      command_line.SetProgram(base::FilePath("gnome-control-center"));
       command_line.AppendArg("sound");
       command_line.AppendArg("input");
       break;
diff --git a/media/audio/mac/audio_device_listener_mac.cc b/media/audio/mac/audio_device_listener_mac.cc
index 8910e90..6121dc6f 100644
--- a/media/audio/mac/audio_device_listener_mac.cc
+++ b/media/audio/mac/audio_device_listener_mac.cc
@@ -215,7 +215,7 @@ bool AudioDeviceListenerMac::LoadAudioObjectPropertyListenerBlockFunctions() {
   // Dynamically load required block functions.
   // TODO(dalecurtis): Remove once the deployment target is > 10.6.
   std::string error;
-  base::NativeLibrary core_audio = base::LoadNativeLibrary(FilePath(
+  base::NativeLibrary core_audio = base::LoadNativeLibrary(base::FilePath(
       "/System/Library/Frameworks/CoreAudio.framework/Versions/Current/"
       "CoreAudio"), &error);
   if (!error.empty()) {
diff --git a/media/audio/win/audio_low_latency_input_win_unittest.cc b/media/audio/win/audio_low_latency_input_win_unittest.cc
index 6eaa352..7ab36af 100644
--- a/media/audio/win/audio_low_latency_input_win_unittest.cc
+++ b/media/audio/win/audio_low_latency_input_win_unittest.cc
@@ -56,7 +56,7 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback {
   explicit WriteToFileAudioSink(const char* file_name)
       : buffer_(0, kMaxBufferSize),
         bytes_to_write_(0) {
-    FilePath file_path;
+    base::FilePath file_path;
     EXPECT_TRUE(PathService::Get(base::DIR_EXE, &file_path));
     file_path = file_path.AppendASCII(file_name);
     binary_file_ = file_util::OpenFile(file_path, "wb");
diff --git a/media/audio/win/audio_low_latency_output_win_unittest.cc b/media/audio/win/audio_low_latency_output_win_unittest.cc
index b4efbb5..09dd75b 100644
--- a/media/audio/win/audio_low_latency_output_win_unittest.cc
+++ b/media/audio/win/audio_low_latency_output_win_unittest.cc
@@ -93,7 +93,7 @@ class ReadFromFileAudioSource : public AudioOutputStream::AudioSourceCallback {
   virtual ~ReadFromFileAudioSource() {
     // Get complete file path to output file in directory containing
     // media_unittests.exe.
-    FilePath file_name;
+    base::FilePath file_name;
     EXPECT_TRUE(PathService::Get(base::DIR_EXE, &file_name));
     file_name = file_name.AppendASCII(kDeltaTimeMsFileName);
 
diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc
index f8e3ba0..dc24ece 100644
--- a/media/audio/win/audio_manager_win.cc
+++ b/media/audio/win/audio_manager_win.cc
@@ -230,7 +230,7 @@ void AudioManagerWin::ShowAudioInputSettings() {
     argument = "mmsys.cpl,,1";
   }
 
-  FilePath path;
+  base::FilePath path;
   PathService::Get(base::DIR_SYSTEM, &path);
   path = path.Append(program);
   CommandLine command_line(path);
diff --git a/media/audio/win/audio_unified_win_unittest.cc b/media/audio/win/audio_unified_win_unittest.cc
index 4d5f41b..125f0c1 100644
--- a/media/audio/win/audio_unified_win_unittest.cc
+++ b/media/audio/win/audio_unified_win_unittest.cc
@@ -69,7 +69,7 @@ class UnifiedSourceCallback : public AudioOutputStream::AudioSourceCallback {
   }
 
   virtual ~UnifiedSourceCallback() {
-    FilePath file_name;
+    base::FilePath file_name;
     EXPECT_TRUE(PathService::Get(base::DIR_EXE, &file_name));
     file_name = file_name.AppendASCII(kDeltaTimeMsFileName);
 
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"))
diff --git a/media/ffmpeg/ffmpeg_common_unittest.cc b/media/ffmpeg/ffmpeg_common_unittest.cc
index d67e1fe..9624b97 100644
--- a/media/ffmpeg/ffmpeg_common_unittest.cc
+++ b/media/ffmpeg/ffmpeg_common_unittest.cc
@@ -43,7 +43,7 @@ static bool InitFFmpeg() {
   if (initialized) {
     return true;
   }
-  FilePath path;
+  base::FilePath path;
   PathService::Get(base::DIR_MODULE, &path);
   return media::InitializeMediaLibrary(path);
 }
diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc
index 4de80ce..f1653c4 100644
--- a/media/ffmpeg/ffmpeg_unittest.cc
+++ b/media/ffmpeg/ffmpeg_unittest.cc
@@ -106,7 +106,7 @@ class FFmpegTest : public testing::TestWithParam<const char*> {
   }
 
   void OpenFile(const std::string& name) {
-    FilePath path;
+    base::FilePath path;
     PathService::Get(base::DIR_SOURCE_ROOT, &path);
     path = path.AppendASCII("media")
         .AppendASCII("test")
@@ -369,7 +369,7 @@ class FFmpegTest : public testing::TestWithParam<const char*> {
       return;
     }
 
-    FilePath path;
+    base::FilePath path;
     PathService::Get(base::DIR_MODULE, &path);
     EXPECT_TRUE(InitializeMediaLibrary(path))
         << "Could not initialize media library.";
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 72b64ae..dc2055b 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -161,7 +161,7 @@ class FFmpegDemuxerTest : public testing::Test {
   void CreateDataSource(const std::string& name) {
     CHECK(!data_source_);
 
-    FilePath file_path;
+    base::FilePath file_path;
     EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &file_path));
 
     file_path = file_path.Append(FILE_PATH_LITERAL("media"))
diff --git a/media/filters/file_data_source.cc b/media/filters/file_data_source.cc
index dab5c58..2f34718 100644
--- a/media/filters/file_data_source.cc
+++ b/media/filters/file_data_source.cc
@@ -15,7 +15,7 @@ FileDataSource::FileDataSource()
       force_streaming_(false) {
 }
 
-bool FileDataSource::Initialize(const FilePath& file_path) {
+bool FileDataSource::Initialize(const base::FilePath& file_path) {
   DCHECK(!file_.IsValid());
 
   if (!file_.Initialize(file_path))
diff --git a/media/filters/file_data_source.h b/media/filters/file_data_source.h
index bc46bf7..edf9e81 100644
--- a/media/filters/file_data_source.h
+++ b/media/filters/file_data_source.h
@@ -19,7 +19,7 @@ class MEDIA_EXPORT FileDataSource : public DataSource {
  public:
   FileDataSource();
 
-  bool Initialize(const FilePath& file_path);
+  bool Initialize(const base::FilePath& file_path);
 
   // Implementation of DataSource.
   virtual void set_host(DataSourceHost* host) OVERRIDE;
diff --git a/media/filters/file_data_source_unittest.cc b/media/filters/file_data_source_unittest.cc
index d7eaad0..a840995 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"))
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index cc41c3a..3e2eb19 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -317,7 +317,7 @@ class MockMediaSource {
   }
 
  private:
-  FilePath file_path_;
+  base::FilePath file_path_;
   scoped_refptr<DecoderBuffer> file_data_;
   int current_position_;
   int initial_append_size_;
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
index b51d022..630e297 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -87,7 +87,7 @@ void PipelineIntegrationTestBase::OnError(PipelineStatus status) {
   message_loop_.PostTask(FROM_HERE, MessageLoop::QuitClosure());
 }
 
-bool PipelineIntegrationTestBase::Start(const FilePath& file_path,
+bool PipelineIntegrationTestBase::Start(const base::FilePath& file_path,
                                         PipelineStatus expected_status) {
   EXPECT_CALL(*this, OnBufferingState(Pipeline::kHaveMetadata))
       .Times(AtMost(1));
@@ -104,14 +104,14 @@ bool PipelineIntegrationTestBase::Start(const FilePath& file_path,
   return (pipeline_status_ == PIPELINE_OK);
 }
 
-bool PipelineIntegrationTestBase::Start(const FilePath& file_path,
+bool PipelineIntegrationTestBase::Start(const base::FilePath& file_path,
                                         PipelineStatus expected_status,
                                         bool hashing_enabled) {
   hashing_enabled_ = hashing_enabled;
   return Start(file_path, expected_status);
 }
 
-bool PipelineIntegrationTestBase::Start(const FilePath& file_path) {
+bool PipelineIntegrationTestBase::Start(const base::FilePath& file_path) {
   EXPECT_CALL(*this, OnBufferingState(Pipeline::kHaveMetadata))
       .Times(AtMost(1));
   EXPECT_CALL(*this, OnBufferingState(Pipeline::kPrerollCompleted))
@@ -183,7 +183,8 @@ bool PipelineIntegrationTestBase::WaitUntilCurrentTimeIsAfter(
 }
 
 scoped_ptr<FilterCollection>
-PipelineIntegrationTestBase::CreateFilterCollection(const FilePath& file_path) {
+PipelineIntegrationTestBase::CreateFilterCollection(
+    const base::FilePath& file_path) {
   scoped_refptr<FileDataSource> data_source = new FileDataSource();
   CHECK(data_source->Initialize(file_path));
   return CreateFilterCollection(
diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc
index 262d532e..b84b3fd 100644
--- a/media/test/ffmpeg_tests/ffmpeg_tests.cc
+++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc
@@ -83,7 +83,7 @@ int main(int argc, const char** argv) {
   }
 
   // Initialize our media library (try loading DLLs, etc.) before continuing.
-  FilePath media_path;
+  base::FilePath media_path;
   PathService::Get(base::DIR_MODULE, &media_path);
   if (!media::InitializeMediaLibrary(media_path)) {
     std::cerr << "Unable to initialize the media library.";
@@ -91,10 +91,10 @@ int main(int argc, const char** argv) {
   }
 
   // Retrieve command line options.
-  FilePath in_path(filenames[0]);
-  FilePath out_path;
+  base::FilePath in_path(filenames[0]);
+  base::FilePath out_path;
   if (filenames.size() > 1)
-    out_path = FilePath(filenames[1]);
+    out_path = base::FilePath(filenames[1]);
 
   // Default flags that match Chrome defaults.
   int video_threads = 2;
diff --git a/media/tools/demuxer_bench/demuxer_bench.cc b/media/tools/demuxer_bench/demuxer_bench.cc
index 9de8d7c..c874c88 100644
--- a/media/tools/demuxer_bench/demuxer_bench.cc
+++ b/media/tools/demuxer_bench/demuxer_bench.cc
@@ -170,7 +170,7 @@ int main(int argc, char** argv) {
 
   MessageLoop message_loop;
   DemuxerHostImpl demuxer_host;
-  FilePath file_path(cmd_line->GetArgs()[0]);
+  base::FilePath file_path(cmd_line->GetArgs()[0]);
 
   // Setup.
   scoped_refptr<media::FileDataSource> data_source =
diff --git a/media/tools/media_bench/media_bench.cc b/media/tools/media_bench/media_bench.cc
index 9d3e070..6910e7e 100644
--- a/media/tools/media_bench/media_bench.cc
+++ b/media/tools/media_bench/media_bench.cc
@@ -126,7 +126,7 @@ int main(int argc, const char** argv) {
   }
 
   // Initialize our media library (try loading DLLs, etc.) before continuing.
-  FilePath media_path;
+  base::FilePath media_path;
   PathService::Get(base::DIR_MODULE, &media_path);
   if (!media::InitializeMediaLibrary(media_path)) {
     std::cerr << "Unable to initialize the media library." << std::endl;
@@ -134,10 +134,10 @@ int main(int argc, const char** argv) {
   }
 
   // Retrieve command line options.
-  FilePath in_path(filenames[0]);
-  FilePath out_path;
+  base::FilePath in_path(filenames[0]);
+  base::FilePath out_path;
   if (filenames.size() > 1)
-    out_path = FilePath(filenames[1]);
+    out_path = base::FilePath(filenames[1]);
   AVMediaType target_codec = AVMEDIA_TYPE_UNKNOWN;
 
   // Determine whether to benchmark audio or video decoding.
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index a91e11d..5b112cf 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -48,7 +48,7 @@ scoped_refptr<media::FileDataSource> CreateFileDataSource(
     const std::string& file_path) {
   scoped_refptr<media::FileDataSource> file_data_source(
       new media::FileDataSource());
-  CHECK(file_data_source->Initialize(FilePath(file_path)));
+  CHECK(file_data_source->Initialize(base::FilePath(file_path)));
   return file_data_source;
 }
 
diff --git a/media/tools/seek_tester/seek_tester.cc b/media/tools/seek_tester/seek_tester.cc
index 2bed876..0249517 100644
--- a/media/tools/seek_tester/seek_tester.cc
+++ b/media/tools/seek_tester/seek_tester.cc
@@ -62,7 +62,7 @@ int main(int argc, char** argv) {
   CHECK(base::StringToUint64(argv[2], &seek_target_ms));
   scoped_refptr<media::FileDataSource> file_data_source(
       new media::FileDataSource());
-  CHECK(file_data_source->Initialize(FilePath::FromUTF8Unsafe(argv[1])));
+  CHECK(file_data_source->Initialize(base::FilePath::FromUTF8Unsafe(argv[1])));
 
   DemuxerHostImpl host;
   MessageLoop loop;
diff --git a/media/video/capture/linux/video_capture_device_linux.cc b/media/video/capture/linux/video_capture_device_linux.cc
index 8d7aaee..2049291 100644
--- a/media/video/capture/linux/video_capture_device_linux.cc
+++ b/media/video/capture/linux/video_capture_device_linux.cc
@@ -105,7 +105,7 @@ void VideoCaptureDevice::GetDeviceNames(Names* device_names) {
   // Empty the name list.
   device_names->clear();
 
-  FilePath path("/dev/");
+  base::FilePath path("/dev/");
   file_util::FileEnumerator enumerator(
       path, false, file_util::FileEnumerator::FILES, "video*");
 
diff --git a/media/video/capture/screen/screen_capturer_mac.mm b/media/video/capture/screen/screen_capturer_mac.mm
index 52e36f1..27aea6c 100644
--- a/media/video/capture/screen/screen_capturer_mac.mm
+++ b/media/video/capture/screen/screen_capturer_mac.mm
@@ -700,13 +700,13 @@ void ScreenCapturerMac::ScreenConfigurationChanged() {
 
   // Dynamically link to the deprecated pre-Lion capture APIs.
   std::string app_services_library_error;
-  FilePath app_services_path(kApplicationServicesLibraryName);
+  base::FilePath app_services_path(kApplicationServicesLibraryName);
   app_services_library_.Reset(
       base::LoadNativeLibrary(app_services_path, &app_services_library_error));
   CHECK(app_services_library_.is_valid()) << app_services_library_error;
 
   std::string opengl_library_error;
-  FilePath opengl_path(kOpenGlLibraryName);
+  base::FilePath opengl_path(kOpenGlLibraryName);
   opengl_library_.Reset(
       base::LoadNativeLibrary(opengl_path, &opengl_library_error));
   CHECK(opengl_library_.is_valid()) << opengl_library_error;
diff --git a/media/video/capture/screen/screen_capturer_win.cc b/media/video/capture/screen/screen_capturer_win.cc
index 796af5f..65fc654 100644
--- a/media/video/capture/screen/screen_capturer_win.cc
+++ b/media/video/capture/screen/screen_capturer_win.cc
@@ -267,7 +267,8 @@ void ScreenCapturerWin::Start(Delegate* delegate) {
 
   // Load dwmapi.dll dynamically since it is not available on XP.
   if (!dwmapi_library_.is_valid()) {
-    FilePath path(base::GetNativeLibraryName(UTF8ToUTF16(kDwmapiLibraryName)));
+    base::FilePath path(base::GetNativeLibraryName(
+        UTF8ToUTF16(kDwmapiLibraryName)));
     dwmapi_library_.Reset(base::LoadNativeLibrary(path, NULL));
   }
 
diff --git a/media/webm/chromeos/webm_encoder.cc b/media/webm/chromeos/webm_encoder.cc
index 62ddad0..26dcdac 100644
--- a/media/webm/chromeos/webm_encoder.cc
+++ b/media/webm/chromeos/webm_encoder.cc
@@ -55,7 +55,7 @@ namespace media {
 
 namespace chromeos {
 
-WebmEncoder::WebmEncoder(const FilePath& output_path,
+WebmEncoder::WebmEncoder(const base::FilePath& output_path,
                          int bitrate,
                          bool realtime)
     : bitrate_(bitrate),