Index: chrome/browser/media/encrypted_media_browsertest.cc |
diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc |
index 113717636024bd24c12a057765b614e40a4520f9..974312c8a67a59da842a36550a88646471e28d04 100644 |
--- a/chrome/browser/media/encrypted_media_browsertest.cc |
+++ b/chrome/browser/media/encrypted_media_browsertest.cc |
@@ -34,10 +34,18 @@ |
// Available key systems. |
const char kClearKeyKeySystem[] = "org.w3.clearkey"; |
const char kExternalClearKeyKeySystem[] = "org.chromium.externalclearkey"; |
+ |
+// Variants of external clear key key system to test different scenarios. |
ddorwin
2016/06/23 19:24:28
nit: E... C... K...
xhwang
2016/06/23 20:53:49
Done.
|
+// To add a new variant, make sure you also update: |
+// - media/test/data/eme_player_js/globals.js |
+// - AddExternalClearKey() in chrome_key_systems.cc |
+// - CreateCdmInstance() in clear_key_cdm.cc |
const char kExternalClearKeyFileIOTestKeySystem[] = |
"org.chromium.externalclearkey.fileiotest"; |
const char kExternalClearKeyInitializeFailKeySystem[] = |
"org.chromium.externalclearkey.initializefail"; |
+const char kExternalClearKeyOutputProtectionTestKeySystem[] = |
+ "org.chromium.externalclearkey.outputprotectiontest"; |
const char kExternalClearKeyCrashKeySystem[] = |
"org.chromium.externalclearkey.crash"; |
@@ -57,7 +65,7 @@ const char kLoadableSession[] = "LoadableSession"; |
const char kUnknownSession[] = "UnknownSession"; |
// EME-specific test results and errors. |
-const char kFileIOTestSuccess[] = "FILE_IO_TEST_SUCCESS"; |
+const char kUnitTestSuccess[] = "UNIT_TEST_SUCCESS"; |
const char kEmeNotSupportedError[] = "NOTSUPPORTEDERROR"; |
const char kEmeGenerateRequestFailed[] = "EME_GENERATEREQUEST_FAILED"; |
const char kEmeSessionNotFound[] = "EME_SESSION_NOT_FOUND"; |
@@ -619,8 +627,14 @@ IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, CDMExpectedCrash) { |
} |
IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, FileIOTest) { |
- TestNonPlaybackCases(kExternalClearKeyFileIOTestKeySystem, |
- kFileIOTestSuccess); |
+ TestNonPlaybackCases(kExternalClearKeyFileIOTestKeySystem, kUnitTestSuccess); |
+} |
+ |
+// TODO(xhwang): Investigate how to fake capturing activities to test the |
+// network link detection logic in OutputProtectionProxy. |
+IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, OutputProtectionTest) { |
+ TestNonPlaybackCases(kExternalClearKeyOutputProtectionTestKeySystem, |
+ kUnitTestSuccess); |
} |
IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) { |