| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/media/media_browsertest.h" | 5 #include "content/browser/media/media_browsertest.h" |
| 6 | 6 |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "content/public/browser/web_contents.h" | 8 #include "content/public/browser/web_contents.h" |
| 9 #include "content/public/test/browser_test_utils.h" | 9 #include "content/public/test/browser_test_utils.h" |
| 10 #include "content/public/test/content_browser_test_utils.h" | 10 #include "content/public/test/content_browser_test_utils.h" |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 } | 214 } |
| 215 | 215 |
| 216 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pTheora)) { | 216 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pTheora)) { |
| 217 RunColorFormatTest("yuv444p.ogv", kEnded); | 217 RunColorFormatTest("yuv444p.ogv", kEnded); |
| 218 } | 218 } |
| 219 | 219 |
| 220 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pVp8)) { | 220 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pVp8)) { |
| 221 RunColorFormatTest("yuv420p.webm", kEnded); | 221 RunColorFormatTest("yuv420p.webm", kEnded); |
| 222 } | 222 } |
| 223 | 223 |
| 224 // TODO(johannkoenig): Reenable after landing libvpx roll | 224 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pVp9)) { |
| 225 // http://www.crbug.com/392309 | |
| 226 IN_PROC_BROWSER_TEST_F(MediaTest, DISABLED_Yuv444pVp9) { | |
| 227 RunColorFormatTest("yuv444p.webm", "ENDED"); | 225 RunColorFormatTest("yuv444p.webm", "ENDED"); |
| 228 } | 226 } |
| 229 | 227 |
| 230 #if defined(USE_PROPRIETARY_CODECS) | 228 #if defined(USE_PROPRIETARY_CODECS) |
| 231 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pH264)) { | 229 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pH264)) { |
| 232 RunColorFormatTest("yuv420p.mp4", kEnded); | 230 RunColorFormatTest("yuv420p.mp4", kEnded); |
| 233 } | 231 } |
| 234 | 232 |
| 235 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuvj420pH264)) { | 233 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuvj420pH264)) { |
| 236 RunColorFormatTest("yuvj420p.mp4", kEnded); | 234 RunColorFormatTest("yuvj420p.mp4", kEnded); |
| 237 } | 235 } |
| 238 | 236 |
| 239 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv422pH264)) { | 237 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv422pH264)) { |
| 240 RunColorFormatTest("yuv422p.mp4", kEnded); | 238 RunColorFormatTest("yuv422p.mp4", kEnded); |
| 241 } | 239 } |
| 242 | 240 |
| 243 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pH264)) { | 241 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pH264)) { |
| 244 RunColorFormatTest("yuv444p.mp4", kEnded); | 242 RunColorFormatTest("yuv444p.mp4", kEnded); |
| 245 } | 243 } |
| 246 | 244 |
| 247 #if defined(OS_CHROMEOS) | 245 #if defined(OS_CHROMEOS) |
| 248 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { | 246 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { |
| 249 RunColorFormatTest("yuv420p.avi", kEnded); | 247 RunColorFormatTest("yuv420p.avi", kEnded); |
| 250 } | 248 } |
| 251 #endif // defined(OS_CHROMEOS) | 249 #endif // defined(OS_CHROMEOS) |
| 252 #endif // defined(USE_PROPRIETARY_CODECS) | 250 #endif // defined(USE_PROPRIETARY_CODECS) |
| 253 | 251 |
| 254 } // namespace content | 252 } // namespace content |
| OLD | NEW |