| 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/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "content/public/browser/web_contents.h" | 9 #include "content/public/browser/web_contents.h" |
| 10 #include "content/public/common/url_constants.h" | 10 #include "content/public/common/url_constants.h" |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 } | 102 } |
| 103 | 103 |
| 104 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearSilentTheora) { | 104 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearSilentTheora) { |
| 105 PlayVideo("bear_silent.ogv", GetParam()); | 105 PlayVideo("bear_silent.ogv", GetParam()); |
| 106 } | 106 } |
| 107 | 107 |
| 108 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWebm) { | 108 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWebm) { |
| 109 PlayVideo("bear.webm", GetParam()); | 109 PlayVideo("bear.webm", GetParam()); |
| 110 } | 110 } |
| 111 | 111 |
| 112 // TODO(dalecurtis): Disabled while the test data file is updated. | 112 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearOpusWebm) { |
| 113 // IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearOpusWebm) { | 113 PlayVideo("bear-opus.webm", GetParam()); |
| 114 // PlayVideo("bear-opus.webm", GetParam()); | 114 } |
| 115 // } | |
| 116 | 115 |
| 117 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearOpusOgg) { | 116 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearOpusOgg) { |
| 118 PlayVideo("bear-opus.ogg", GetParam()); | 117 PlayVideo("bear-opus.ogg", GetParam()); |
| 119 } | 118 } |
| 120 | 119 |
| 121 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearSilentWebm) { | 120 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearSilentWebm) { |
| 122 PlayVideo("bear_silent.webm", GetParam()); | 121 PlayVideo("bear_silent.webm", GetParam()); |
| 123 } | 122 } |
| 124 | 123 |
| 125 #if defined(USE_PROPRIETARY_CODECS) | 124 #if defined(USE_PROPRIETARY_CODECS) |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 } | 245 } |
| 247 | 246 |
| 248 #if defined(OS_CHROMEOS) | 247 #if defined(OS_CHROMEOS) |
| 249 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { | 248 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { |
| 250 RunColorFormatTest("yuv420p.avi", "ENDED"); | 249 RunColorFormatTest("yuv420p.avi", "ENDED"); |
| 251 } | 250 } |
| 252 #endif // defined(OS_CHROMEOS) | 251 #endif // defined(OS_CHROMEOS) |
| 253 #endif // defined(USE_PROPRIETARY_CODECS) | 252 #endif // defined(USE_PROPRIETARY_CODECS) |
| 254 | 253 |
| 255 } // namespace content | 254 } // namespace content |
| OLD | NEW |