| 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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 // IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) { | 141 // IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) { |
| 142 // PlayAudio("bear.flac", GetParam()); | 142 // PlayAudio("bear.flac", GetParam()); |
| 143 // } | 143 // } |
| 144 #endif | 144 #endif |
| 145 #endif | 145 #endif |
| 146 | 146 |
| 147 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) { | 147 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) { |
| 148 PlayAudio("bear_pcm.wav", GetParam()); | 148 PlayAudio("bear_pcm.wav", GetParam()); |
| 149 } | 149 } |
| 150 | 150 |
| 151 IN_PROC_BROWSER_TEST_P(MediaTest, VideoTulipWebm) { | 151 #if defined(OS_MACOSX) |
| 152 // Flaking on Mac 10.6. http://crbug.com/143151 |
| 153 #define MAYBE_VideoTulipWebm FLAKY_VideoTulipWebm |
| 154 #else |
| 155 #define MAYBE_VideoTulipWebm VideoTulipWebm |
| 156 #endif |
| 157 IN_PROC_BROWSER_TEST_P(MediaTest, MAYBE_VideoTulipWebm) { |
| 152 PlayVideo("tulip2.webm", GetParam()); | 158 PlayVideo("tulip2.webm", GetParam()); |
| 153 } | 159 } |
| 154 | 160 |
| 155 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); | 161 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); |
| 156 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); | 162 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); |
| 157 | 163 |
| 158 class MediaLayoutTest : public InProcessBrowserLayoutTest { | 164 class MediaLayoutTest : public InProcessBrowserLayoutTest { |
| 159 protected: | 165 protected: |
| 160 MediaLayoutTest() : InProcessBrowserLayoutTest( | 166 MediaLayoutTest() : InProcessBrowserLayoutTest( |
| 161 FilePath(), FilePath().AppendASCII("media")) { | 167 FilePath(), FilePath().AppendASCII("media")) { |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 RunLayoutTest("video-autoplay.html"); | 200 RunLayoutTest("video-autoplay.html"); |
| 195 } | 201 } |
| 196 | 202 |
| 197 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoLoopTest) { | 203 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoLoopTest) { |
| 198 RunLayoutTest("video-loop.html"); | 204 RunLayoutTest("video-loop.html"); |
| 199 } | 205 } |
| 200 | 206 |
| 201 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoNoAutoplayTest) { | 207 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoNoAutoplayTest) { |
| 202 RunLayoutTest("video-no-autoplay.html"); | 208 RunLayoutTest("video-no-autoplay.html"); |
| 203 } | 209 } |
| OLD | NEW |