summaryrefslogtreecommitdiffstats
path: root/media/tools
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-10 05:15:45 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-10 05:15:45 +0000
commit79f6388902881a0aab426e9606c544b68ab3b9bc (patch)
treedf8da7e82fded47bccf4fe32922a8451a475bf97 /media/tools
parent6d4b67a4b50d73d5001aec99014ac40bc504871a (diff)
downloadchromium_src-79f6388902881a0aab426e9606c544b68ab3b9bc.zip
chromium_src-79f6388902881a0aab426e9606c544b68ab3b9bc.tar.gz
chromium_src-79f6388902881a0aab426e9606c544b68ab3b9bc.tar.bz2
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
Diffstat (limited to 'media/tools')
-rw-r--r--media/tools/demuxer_bench/demuxer_bench.cc2
-rw-r--r--media/tools/media_bench/media_bench.cc8
-rw-r--r--media/tools/player_x11/player_x11.cc2
-rw-r--r--media/tools/seek_tester/seek_tester.cc2
4 files changed, 7 insertions, 7 deletions
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;