EME: Correctly handle container-only contentType strings

third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html

Index: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html
diff --git a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html
index 713774acb63596c720d8926719629e1bef11e2ad..e338cb07c0ac10cca08c3d984c21a26142c34521 100644
--- a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html
+++ b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html
@@ -82,6 +82,8 @@
             expect_config('org.w3.clearkey', [{}], {}, 'Empty configuration');
 
             // Various combinations of supportedConfigurations.
+            // TODO(jrummell): Specifying contentType without codecs is
+            // deprecated, so this test should fail. http://crbug.com/605661.
             expect_config('org.w3.clearkey', [{
                 initDataTypes: ['webm'],
                 audioCapabilities: [{contentType: 'audio/webm'}],
@@ -92,6 +94,8 @@
                 videoCapabilities: [{contentType: 'video/webm'}],
             }, 'Basic supported configuration');
 
+            // TODO(jrummell): Specifying contentType without codecs is
+            // deprecated, so this test should fail. http://crbug.com/605661.
             expect_config('org.w3.clearkey', [{
                 initDataTypes: ['fakeidt', 'webm'],
                 audioCapabilities: [{contentType: 'audio/fake'}, {contentType: 'audio/webm'}],
@@ -254,11 +258,17 @@
             }, 'Codecs=');
 
             expect_config('org.w3.clearkey', [{
-                videoCapabilities: [{contentType: 'VIDEO/WEBM; CODECS="vp8"'}],
+                videoCapabilities: [{contentType: 'VIDEO/WEBM; codecs="vp8"'}],
             }], {
-                videoCapabilities: [{contentType: 'VIDEO/WEBM; CODECS="vp8"'}],
+                videoCapabilities: [{contentType: 'VIDEO/WEBM; codecs="vp8"'}],
             }, 'VIDEO/WEBM');
 
+            expect_config('org.w3.clearkey', [{
+                videoCapabilities: [{contentType: 'video/webm; CODECS="vp8"'}],
+            }], {
+                videoCapabilities: [{contentType: 'video/webm; CODECS="vp8"'}],
+            }, 'CODECS=');
+
             // Unrecognized attributes are not allowed.
             // TODO(jrummell): Unrecognized attributes are ignored currently.
             // http://crbug.com/449690