Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(462)

Unified Diff: media/base/yuv_convert_unittest.cc

Issue 12217101: Replace FilePath with base::FilePath in some more top level directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/test_data_util.cc ('k') | media/ffmpeg/ffmpeg_common_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/yuv_convert_unittest.cc
diff --git a/media/base/yuv_convert_unittest.cc b/media/base/yuv_convert_unittest.cc
index c2647e7b025612102ed204c826a36647e74db372..e88ca9f0893dfadf3a4aa2e08396618fd837fa5e 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"))
« no previous file with comments | « media/base/test_data_util.cc ('k') | media/ffmpeg/ffmpeg_common_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698