diff options
| author | jrummell <jrummell@chromium.org> | 2015-10-02 14:41:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-02 21:42:17 +0000 |
| commit | 9a9d335fa5f68d51b29599a7e55225b2dd8c41f4 (patch) | |
| tree | 76acfb9f1b88ecfb6a8b35583cb3aa8f845a11fd /android_webview | |
| parent | 7883b51e4caaafaf041276fea0b1261f2e732f14 (diff) | |
| download | chromium_src-9a9d335fa5f68d51b29599a7e55225b2dd8c41f4.zip chromium_src-9a9d335fa5f68d51b29599a7e55225b2dd8c41f4.tar.gz chromium_src-9a9d335fa5f68d51b29599a7e55225b2dd8c41f4.tar.bz2 | |
Check key system name consistently
Changes so that RequestMediaKeySystemAccess() and createMediaKeys()
verify that the key system is supported in the same way. Unprefixed
EME checks unchanged.
BUG=531764
TEST=EME browser_tests pass
Review URL: https://codereview.chromium.org/1374943004
Cr-Commit-Position: refs/heads/master@{#352138}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/KeySystemTest.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/KeySystemTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/KeySystemTest.java index ccc036f..3509cad 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/KeySystemTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/KeySystemTest.java @@ -121,10 +121,9 @@ public class KeySystemTest extends AwTestBase { assertEquals("\"supported\"", isKeySystemSupported("x-com.oem.test-keysystem")); } - // TODO(ddorwin): This should fail: http://crbug.com/531764. @Feature({"AndroidWebView"}) @SmallTest public void testSupportPlatformKeySystemNoPrefix() throws Throwable { - assertEquals("\"supported\"", isKeySystemSupported("com.oem.test-keysystem")); + assertEquals("\"NotSupportedError\"", isKeySystemSupported("com.oem.test-keysystem")); } } |