| 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/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/string16.h" | 8 #include "base/string16.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 #endif | 122 #endif |
| 123 | 123 |
| 124 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) { | 124 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) { |
| 125 const string16 kExpected = ASCIIToUTF16( | 125 const string16 kExpected = ASCIIToUTF16( |
| 126 StringToUpperASCII(std::string("GenerateKeyRequestException"))); | 126 StringToUpperASCII(std::string("GenerateKeyRequestException"))); |
| 127 ASSERT_NO_FATAL_FAILURE( | 127 ASSERT_NO_FATAL_FAILURE( |
| 128 TestSimplePlayback("bear-320x240-av-enc_av.webm", kWebMAudioVideo, | 128 TestSimplePlayback("bear-320x240-av-enc_av.webm", kWebMAudioVideo, |
| 129 "com.example.invalid", kExpected)); | 129 "com.example.invalid", kExpected)); |
| 130 } | 130 } |
| 131 | 131 |
| 132 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback_AudioOnly) { | 132 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_AudioOnly) { |
| 133 const string16 kExpected = ASCIIToUTF16("ENDED"); | 133 const string16 kExpected = ASCIIToUTF16("ENDED"); |
| 134 ASSERT_NO_FATAL_FAILURE( | 134 ASSERT_NO_FATAL_FAILURE( |
| 135 TestSimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly, | 135 TestSimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly, |
| 136 GetParam(), kExpected)); | 136 GetParam(), kExpected)); |
| 137 } | 137 } |
| 138 | 138 |
| 139 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_AudioClearVideo) { | 139 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_AudioClearVideo) { |
| 140 const string16 kExpected = ASCIIToUTF16("ENDED"); | 140 const string16 kExpected = ASCIIToUTF16("ENDED"); |
| 141 ASSERT_NO_FATAL_FAILURE( | 141 ASSERT_NO_FATAL_FAILURE( |
| 142 TestSimplePlayback("bear-320x240-av-enc_a.webm", kWebMAudioVideo, | 142 TestSimplePlayback("bear-320x240-av-enc_a.webm", kWebMAudioVideo, |
| (...skipping 20 matching lines...) Expand all Loading... |
| 163 TestSimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo, | 163 TestSimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo, |
| 164 GetParam(), kExpected)); | 164 GetParam(), kExpected)); |
| 165 } | 165 } |
| 166 | 166 |
| 167 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) { | 167 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) { |
| 168 const string16 kExpected = ASCIIToUTF16("ENDED"); | 168 const string16 kExpected = ASCIIToUTF16("ENDED"); |
| 169 ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected)); | 169 ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected)); |
| 170 } | 170 } |
| 171 | 171 |
| 172 } // namespace content | 172 } // namespace content |
| OLD | NEW |