media: Update getStatusForPolicy() minHdcpVersion string format

The explainer has been updated to formalize the minHdcpVersion string
format to be "1.0", "1.1" etc.

This CL updates Chromium's implementation to use the new string format
instead of the old format, e.g. "hdcp-1.0", "hdcp-1.1", etc.

Bug: 709348
Test: Existing tests updated.
Change-Id: I4fe1061077228564fd6931d9900cfd19553dcf09
Reviewed-on: https://chromium-review.googlesource.com/c/1338576Reviewed-by: John Rummell <jrummell@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608979}

media/blink/webcontentdecryptionmodule_impl.cc

@@ -34,27 +34,27 @@ bool ConvertHdcpVersion(const blink::WebString& hdcp_version_string,
 
   std::string hdcp_version_ascii = hdcp_version_string.Ascii();
 
-  // TODO(xhwang): This implementation assumes exact string match. Update this
-  // when we have the string format speced in the spec/registry.
+  // The strings are specified in the explainer doc:
+  // https://github.com/WICG/hdcp-detection/blob/master/explainer.md
   if (hdcp_version_ascii.empty())
     *hdcp_version = HdcpVersion::kHdcpVersionNone;
-  else if (hdcp_version_ascii == "hdcp-1.0")
+  else if (hdcp_version_ascii == "1.0")
     *hdcp_version = HdcpVersion::kHdcpVersion1_0;
-  else if (hdcp_version_ascii == "hdcp-1.1")
+  else if (hdcp_version_ascii == "1.1")
     *hdcp_version = HdcpVersion::kHdcpVersion1_1;
-  else if (hdcp_version_ascii == "hdcp-1.2")
+  else if (hdcp_version_ascii == "1.2")
     *hdcp_version = HdcpVersion::kHdcpVersion1_2;
-  else if (hdcp_version_ascii == "hdcp-1.3")
+  else if (hdcp_version_ascii == "1.3")
     *hdcp_version = HdcpVersion::kHdcpVersion1_3;
-  else if (hdcp_version_ascii == "hdcp-1.4")
+  else if (hdcp_version_ascii == "1.4")
     *hdcp_version = HdcpVersion::kHdcpVersion1_4;
-  else if (hdcp_version_ascii == "hdcp-2.0")
+  else if (hdcp_version_ascii == "2.0")
     *hdcp_version = HdcpVersion::kHdcpVersion2_0;
-  else if (hdcp_version_ascii == "hdcp-2.1")
+  else if (hdcp_version_ascii == "2.1")
     *hdcp_version = HdcpVersion::kHdcpVersion2_1;
-  else if (hdcp_version_ascii == "hdcp-2.2")
+  else if (hdcp_version_ascii == "2.2")
     *hdcp_version = HdcpVersion::kHdcpVersion2_2;
-  else if (hdcp_version_ascii == "hdcp-2.3")
+  else if (hdcp_version_ascii == "2.3")
     *hdcp_version = HdcpVersion::kHdcpVersion2_3;
   else
     return false;

media/test/data/eme_player_js/player_utils.js

@@ -103,8 +103,8 @@ PlayerUtils.registerEMEEventListeners = function(player) {
         // ClearKeyCdm::GetStatusForPolicy() for details.
         return Promise.all([
           getStatusForHdcpPolicy(mediaKeys, '', 'usable'),
-          getStatusForHdcpPolicy(mediaKeys, 'hdcp-1.0', 'usable'),
-          getStatusForHdcpPolicy(mediaKeys, 'hdcp-2.3', 'output-restricted'),
+          getStatusForHdcpPolicy(mediaKeys, '1.0', 'usable'),
+          getStatusForHdcpPolicy(mediaKeys, '2.3', 'output-restricted'),
         ]);
       }
 
@@ -113,7 +113,7 @@ PlayerUtils.registerEMEEventListeners = function(player) {
         // is always rejected.
         return Promise.all([
           getStatusForHdcpPolicy(mediaKeys, '', 'rejected'),
-          getStatusForHdcpPolicy(mediaKeys, 'hdcp-1.0', 'rejected'),
+          getStatusForHdcpPolicy(mediaKeys, '1.0', 'rejected'),
         ]);
       }
 
@@ -123,7 +123,7 @@ PlayerUtils.registerEMEEventListeners = function(player) {
         // so we cannot enforce it.
         return Promise.all([
           getStatusForHdcpPolicy(mediaKeys, '', 'usable'),
-          getStatusForHdcpPolicy(mediaKeys, 'hdcp-1.0', 'resolved'),
+          getStatusForHdcpPolicy(mediaKeys, '1.0', 'resolved'),
         ]);
       }
 

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

@@ -11,7 +11,7 @@
             promise_test(function(test)
             {
                 var hdcpVersionNone = '';
-                var hdcpVersion2_0 = 'hdcp-2.0';
+                var hdcpVersion2_0 = '2.0';
                 var mediaKeys;
 
                 // Calls getStatusForPolicy() with |hdcpVersion| and expects it