Chromium Code Reviews| 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 118 ::testing::Values(kExternalClearKeyKeySystem)); | 118 ::testing::Values(kExternalClearKeyKeySystem)); |
| 119 | 119 |
| 120 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) { | 120 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) { |
| 121 const string16 kExpected = ASCIIToUTF16( | 121 const string16 kExpected = ASCIIToUTF16( |
| 122 StringToUpperASCII(std::string("GenerateKeyRequestException"))); | 122 StringToUpperASCII(std::string("GenerateKeyRequestException"))); |
| 123 ASSERT_NO_FATAL_FAILURE( | 123 ASSERT_NO_FATAL_FAILURE( |
| 124 TestSimplePlayback("bear-320x240-av-enc_av.webm", kWebMAudioVideo, | 124 TestSimplePlayback("bear-320x240-av-enc_av.webm", kWebMAudioVideo, |
| 125 "com.example.invalid", kExpected)); | 125 "com.example.invalid", kExpected)); |
| 126 } | 126 } |
| 127 | 127 |
| 128 #if defined(OS_LINUX) && !defined(NDEBUG) | |
| 129 // http://crbug.com/174294 | |
| 130 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback_AudioOnly) { | |
|
Bernhard Bauer
2013/02/05 14:57:16
We usually use a MAYBE_ prefix for the test and ex
| |
| 131 #else | |
| 128 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_AudioOnly) { | 132 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_AudioOnly) { |
| 133 #endif | |
| 129 const string16 kExpected = ASCIIToUTF16("ENDED"); | 134 const string16 kExpected = ASCIIToUTF16("ENDED"); |
| 130 ASSERT_NO_FATAL_FAILURE( | 135 ASSERT_NO_FATAL_FAILURE( |
| 131 TestSimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly, | 136 TestSimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly, |
| 132 GetParam(), kExpected)); | 137 GetParam(), kExpected)); |
| 133 } | 138 } |
| 134 | 139 |
| 140 #if defined(OS_LINUX) && !defined(NDEBUG) | |
| 141 // http://crbug.com/174294 | |
| 142 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, | |
| 143 DISABLED_BasicPlayback_AudioClearVideo) { | |
| 144 #else | |
| 135 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_AudioClearVideo) { | 145 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_AudioClearVideo) { |
| 146 #endif | |
| 136 const string16 kExpected = ASCIIToUTF16("ENDED"); | 147 const string16 kExpected = ASCIIToUTF16("ENDED"); |
| 137 ASSERT_NO_FATAL_FAILURE( | 148 ASSERT_NO_FATAL_FAILURE( |
| 138 TestSimplePlayback("bear-320x240-av-enc_a.webm", kWebMAudioVideo, | 149 TestSimplePlayback("bear-320x240-av-enc_a.webm", kWebMAudioVideo, |
| 139 GetParam(), kExpected)); | 150 GetParam(), kExpected)); |
| 140 } | 151 } |
| 141 | 152 |
| 153 #if defined(OS_LINUX) && !defined(NDEBUG) | |
| 154 // http://crbug.com/174294 | |
| 155 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback_VideoAudio) { | |
| 156 #else | |
| 142 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoAudio) { | 157 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoAudio) { |
| 158 #endif | |
| 143 const string16 kExpected = ASCIIToUTF16("ENDED"); | 159 const string16 kExpected = ASCIIToUTF16("ENDED"); |
| 144 ASSERT_NO_FATAL_FAILURE( | 160 ASSERT_NO_FATAL_FAILURE( |
| 145 TestSimplePlayback("bear-320x240-av-enc_av.webm", kWebMAudioVideo, | 161 TestSimplePlayback("bear-320x240-av-enc_av.webm", kWebMAudioVideo, |
| 146 GetParam(), kExpected)); | 162 GetParam(), kExpected)); |
| 147 } | 163 } |
| 148 | 164 |
| 165 #if defined(OS_LINUX) && !defined(NDEBUG) | |
| 166 // http://crbug.com/174294 | |
| 167 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback_VideoOnly) { | |
| 168 #else | |
| 149 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoOnly) { | 169 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoOnly) { |
| 170 #endif | |
| 150 const string16 kExpected = ASCIIToUTF16("ENDED"); | 171 const string16 kExpected = ASCIIToUTF16("ENDED"); |
| 151 ASSERT_NO_FATAL_FAILURE( | 172 ASSERT_NO_FATAL_FAILURE( |
| 152 TestSimplePlayback("bear-320x240-v-enc_v.webm", kWebMVideoOnly, | 173 TestSimplePlayback("bear-320x240-v-enc_v.webm", kWebMVideoOnly, |
| 153 GetParam(), kExpected)); | 174 GetParam(), kExpected)); |
| 154 } | 175 } |
| 155 | 176 |
| 177 #if defined(OS_LINUX) && !defined(NDEBUG) | |
| 178 // http://crbug.com/174294 | |
| 179 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, | |
| 180 DISABLED_BasicPlayback_VideoClearAudio) { | |
| 181 #else | |
| 156 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoClearAudio) { | 182 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoClearAudio) { |
| 183 #endif | |
| 157 const string16 kExpected = ASCIIToUTF16("ENDED"); | 184 const string16 kExpected = ASCIIToUTF16("ENDED"); |
| 158 ASSERT_NO_FATAL_FAILURE( | 185 ASSERT_NO_FATAL_FAILURE( |
| 159 TestSimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo, | 186 TestSimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo, |
| 160 GetParam(), kExpected)); | 187 GetParam(), kExpected)); |
| 161 } | 188 } |
| 162 | 189 |
| 163 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) { | 190 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) { |
| 164 const string16 kExpected = ASCIIToUTF16("ENDED"); | 191 const string16 kExpected = ASCIIToUTF16("ENDED"); |
| 165 ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected)); | 192 ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected)); |
| 166 } | 193 } |
| 167 | 194 |
| 168 } // namespace content | 195 } // namespace content |
| OLD | NEW |