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/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/string16.h" | 9 #include "base/string16.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 GetParam(), kExpected)); | 153 GetParam(), kExpected)); |
154 } | 154 } |
155 | 155 |
156 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoClearAudio) { | 156 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoClearAudio) { |
157 const string16 kExpected = ASCIIToUTF16("ENDED"); | 157 const string16 kExpected = ASCIIToUTF16("ENDED"); |
158 ASSERT_NO_FATAL_FAILURE( | 158 ASSERT_NO_FATAL_FAILURE( |
159 TestSimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo, | 159 TestSimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo, |
160 GetParam(), kExpected)); | 160 GetParam(), kExpected)); |
161 } | 161 } |
162 | 162 |
163 #if !defined(OS_LINUX) | 163 #if defined(OS_LINUX) |
164 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) { | 164 #define MAYBE_FrameChangeVideo DISABLED_FrameChangeVideo |
| 165 #else |
| 166 #define MAYBE_FrameChangeVideo FrameChangeVideo |
| 167 #endif |
| 168 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameChangeVideo) { |
165 const string16 kExpected = ASCIIToUTF16("ENDED"); | 169 const string16 kExpected = ASCIIToUTF16("ENDED"); |
166 ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected)); | 170 ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected)); |
167 } | 171 } |
168 #endif | |
169 | 172 |
170 } // namespace content | 173 } // namespace content |
OLD | NEW |