| 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 PlayAudio("bear_mulaw.wav", GetParam()); | 130 PlayAudio("bear_mulaw.wav", GetParam()); |
| 131 } | 131 } |
| 132 | 132 |
| 133 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) { | 133 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) { |
| 134 PlayAudio("bear.flac", GetParam()); | 134 PlayAudio("bear.flac", GetParam()); |
| 135 } | 135 } |
| 136 #endif | 136 #endif |
| 137 #endif | 137 #endif |
| 138 | 138 |
| 139 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) { | 139 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) { |
| 140 // Temporarily skip running HTTP version of the |
| 141 // test since it times out frequently on the ASAN bots. |
| 142 // Remove this condition once http://crbug.com/169031 |
| 143 // has been fixed. |
| 144 if (GetParam()) |
| 145 return; |
| 140 PlayAudio("bear_pcm.wav", GetParam()); | 146 PlayAudio("bear_pcm.wav", GetParam()); |
| 141 } | 147 } |
| 142 | 148 |
| 143 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm3kHz) { | 149 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm3kHz) { |
| 144 PlayAudio("bear_3kHz.wav", GetParam()); | 150 PlayAudio("bear_3kHz.wav", GetParam()); |
| 145 } | 151 } |
| 146 | 152 |
| 147 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm192kHz) { | 153 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm192kHz) { |
| 148 PlayAudio("bear_192kHz.wav", GetParam()); | 154 PlayAudio("bear_192kHz.wav", GetParam()); |
| 149 } | 155 } |
| (...skipping 23 matching lines...) Expand all Loading... |
| 173 | 179 |
| 174 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoLoopTest) { | 180 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoLoopTest) { |
| 175 RunLayoutTest("video-loop.html"); | 181 RunLayoutTest("video-loop.html"); |
| 176 } | 182 } |
| 177 | 183 |
| 178 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoNoAutoplayTest) { | 184 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoNoAutoplayTest) { |
| 179 RunLayoutTest("video-no-autoplay.html"); | 185 RunLayoutTest("video-no-autoplay.html"); |
| 180 } | 186 } |
| 181 | 187 |
| 182 } // namespace content | 188 } // namespace content |
| OLD | NEW |