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/string_number_conversions.h" | 6 #include "base/strings/string_number_conversions.h" |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "content/browser/media/media_browsertest.h" | 9 #include "content/browser/media/media_browsertest.h" |
10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
11 #include "content/public/test/browser_test_utils.h" | 11 #include "content/public/test/browser_test_utils.h" |
12 #include "content/shell/browser/shell.h" | 12 #include "content/shell/browser/shell.h" |
13 #include "media/base/media.h" | 13 #include "media/base/media.h" |
14 #include "media/base/media_switches.h" | 14 #include "media/base/media_switches.h" |
| 15 #include "media/mojo/features.h" |
15 | 16 |
16 #if defined(OS_ANDROID) | 17 #if defined(OS_ANDROID) |
17 #include "base/android/build_info.h" | 18 #include "base/android/build_info.h" |
18 #endif | 19 #endif |
19 | 20 |
20 #if defined(OS_WIN) | 21 #if defined(OS_WIN) |
21 #include "base/win/windows_version.h" | 22 #include "base/win/windows_version.h" |
22 #endif | 23 #endif |
23 | 24 |
24 #if defined(ENABLE_MOJO_CDM) | 25 #if BUILDFLAG(ENABLE_MOJO_CDM) |
25 // When mojo CDM is enabled, External Clear Key is supported in //content/shell/ | 26 // When mojo CDM is enabled, External Clear Key is supported in //content/shell/ |
26 // by using mojo CDM with AesDecryptor running in the remote (e.g. GPU or | 27 // by using mojo CDM with AesDecryptor running in the remote (e.g. GPU or |
27 // Browser) process. | 28 // Browser) process. |
28 // Note that External Clear Key is also supported in chrome/ when pepper CDM is | 29 // Note that External Clear Key is also supported in chrome/ when pepper CDM is |
29 // used, which is tested in browser_tests. | 30 // used, which is tested in browser_tests. |
30 #define SUPPORTS_EXTERNAL_CLEAR_KEY_IN_CONTENT_SHELL | 31 #define SUPPORTS_EXTERNAL_CLEAR_KEY_IN_CONTENT_SHELL |
31 #endif | 32 #endif |
32 | 33 |
33 namespace content { | 34 namespace content { |
34 | 35 |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 TestFrameSizeChange(); | 261 TestFrameSizeChange(); |
261 } | 262 } |
262 | 263 |
263 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { | 264 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { |
264 RunEncryptedMediaTest(kDefaultEmePlayer, "bear-a_enc-a.webm", | 265 RunEncryptedMediaTest(kDefaultEmePlayer, "bear-a_enc-a.webm", |
265 kWebMVorbisAudioOnly, "com.example.foo", SrcType::MSE, | 266 kWebMVorbisAudioOnly, "com.example.foo", SrcType::MSE, |
266 kEmeNotSupportedError); | 267 kEmeNotSupportedError); |
267 } | 268 } |
268 | 269 |
269 } // namespace content | 270 } // namespace content |
OLD | NEW |