OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
7 #include "base/win/windows_version.h" | |
8 #include "build/build_config.h" | 7 #include "build/build_config.h" |
9 #include "content/browser/media/media_browsertest.h" | 8 #include "content/browser/media/media_browsertest.h" |
10 #include "content/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
11 #include "content/public/test/browser_test_utils.h" | 10 #include "content/public/test/browser_test_utils.h" |
12 #include "content/shell/browser/shell.h" | 11 #include "content/shell/browser/shell.h" |
13 #include "media/base/media.h" | 12 #include "media/base/media.h" |
14 #include "media/base/media_switches.h" | 13 #include "media/base/media_switches.h" |
15 | 14 |
16 #if defined(OS_ANDROID) | 15 #if defined(OS_ANDROID) |
17 #include "base/android/build_info.h" | 16 #include "base/android/build_info.h" |
18 #endif | 17 #endif |
19 | 18 |
| 19 #if defined(OS_WIN) |
| 20 #include "base/win/windows_version.h" |
| 21 #endif |
| 22 |
20 #if defined(ENABLE_MOJO_CDM) | 23 #if defined(ENABLE_MOJO_CDM) |
21 // When mojo CDM is enabled, External Clear Key is supported in //content/shell/ | 24 // When mojo CDM is enabled, External Clear Key is supported in //content/shell/ |
22 // by using mojo CDM with AesDecryptor running in the remote (e.g. GPU or | 25 // by using mojo CDM with AesDecryptor running in the remote (e.g. GPU or |
23 // Browser) process. | 26 // Browser) process. |
24 // Note that External Clear Key is also supported in chrome/ when pepper CDM is | 27 // Note that External Clear Key is also supported in chrome/ when pepper CDM is |
25 // used, which is tested in browser_tests. | 28 // used, which is tested in browser_tests. |
26 #define SUPPORTS_EXTERNAL_CLEAR_KEY_IN_CONTENT_SHELL | 29 #define SUPPORTS_EXTERNAL_CLEAR_KEY_IN_CONTENT_SHELL |
27 #endif | 30 #endif |
28 | 31 |
29 // Available key systems. | 32 // Available key systems. |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 TestFrameSizeChange(); | 225 TestFrameSizeChange(); |
223 } | 226 } |
224 | 227 |
225 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { | 228 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { |
226 RunEncryptedMediaTest(kDefaultEmePlayer, "bear-a_enc-a.webm", | 229 RunEncryptedMediaTest(kDefaultEmePlayer, "bear-a_enc-a.webm", |
227 kWebMVorbisAudioOnly, "com.example.foo", MSE, | 230 kWebMVorbisAudioOnly, "com.example.foo", MSE, |
228 kEmeNotSupportedError); | 231 kEmeNotSupportedError); |
229 } | 232 } |
230 | 233 |
231 } // namespace content | 234 } // namespace content |
OLD | NEW |