| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/string16.h" | 7 #include "base/string16.h" |
| 8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 } | 130 } |
| 131 | 131 |
| 132 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavGsmms) { | 132 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavGsmms) { |
| 133 PlayAudio("bear_gsm_ms.wav", GetParam()); | 133 PlayAudio("bear_gsm_ms.wav", GetParam()); |
| 134 } | 134 } |
| 135 | 135 |
| 136 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) { | 136 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) { |
| 137 PlayAudio("bear_mulaw.wav", GetParam()); | 137 PlayAudio("bear_mulaw.wav", GetParam()); |
| 138 } | 138 } |
| 139 | 139 |
| 140 // TODO(dalecurtis): Fails seek test. http://crbug.com/141020 | 140 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) { |
| 141 IN_PROC_BROWSER_TEST_P(MediaTest, DISABLED_VideoBearFlac) { | |
| 142 PlayAudio("bear.flac", GetParam()); | 141 PlayAudio("bear.flac", GetParam()); |
| 143 } | 142 } |
| 144 #endif | 143 #endif |
| 145 #endif | 144 #endif |
| 146 | 145 |
| 147 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) { | 146 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) { |
| 148 PlayAudio("bear_pcm.wav", GetParam()); | 147 PlayAudio("bear_pcm.wav", GetParam()); |
| 149 } | 148 } |
| 150 | 149 |
| 151 #if defined(OS_MACOSX) | 150 #if defined(OS_MACOSX) |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 RunLayoutTest("video-autoplay.html"); | 200 RunLayoutTest("video-autoplay.html"); |
| 202 } | 201 } |
| 203 | 202 |
| 204 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoLoopTest) { | 203 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoLoopTest) { |
| 205 RunLayoutTest("video-loop.html"); | 204 RunLayoutTest("video-loop.html"); |
| 206 } | 205 } |
| 207 | 206 |
| 208 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoNoAutoplayTest) { | 207 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoNoAutoplayTest) { |
| 209 RunLayoutTest("video-no-autoplay.html"); | 208 RunLayoutTest("video-no-autoplay.html"); |
| 210 } | 209 } |
| OLD | NEW |