| Index: content/browser/media/media_browsertest.cc
|
| diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
|
| index f47c4a506a96769b690649e0de1e995f91daff8d..33596fd0807ac18c7153cd98348d792ba0c994ce 100644
|
| --- a/content/browser/media/media_browsertest.cc
|
| +++ b/content/browser/media/media_browsertest.cc
|
| @@ -78,10 +78,12 @@ class MediaTest : public testing::WithParamInterface<bool>,
|
|
|
| // Run specified color format test with the expected result.
|
| void RunColorFormatTest(const std::string& media_file,
|
| - const std::string& expected) {
|
| + const std::string& expected_title) {
|
| base::FilePath test_file_path =
|
| media::GetTestDataFilePath("blackwhite.html");
|
| - RunTest(GetFileUrlWithQuery(test_file_path, media_file), expected);
|
| + std::string final_title = RunTest(
|
| + GetFileUrlWithQuery(test_file_path, media_file), expected_title);
|
| + EXPECT_EQ(expected_title, final_title);
|
| }
|
|
|
| void PlayMedia(const std::string& tag,
|
| @@ -248,7 +250,7 @@ IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pVp8) {
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(MediaTest, Yuv444pVp9) {
|
| - RunColorFormatTest("yuv444p.webm", "ENDED");
|
| + RunColorFormatTest("yuv444p.webm", kEnded);
|
| }
|
|
|
| #if defined(USE_PROPRIETARY_CODECS)
|
| @@ -261,7 +263,9 @@ IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pRec709H264) {
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(MediaTest, Yuvj420pH264) {
|
| - RunColorFormatTest("yuvj420p.mp4", kEnded);
|
| + // TODO(watk): Re-enable this when JPEG color range support is fixed.
|
| + // crbug.com/507455
|
| + // RunColorFormatTest("yuvj420p.mp4", kEnded);
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(MediaTest, Yuv422pH264) {
|
|
|