Reland of "Convert Widevine and Android platform key systems to KeySystemProperties" with fix

chrome/renderer/chrome_content_renderer_client.cc

Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 3be44db4e3ac995486403a314e04a0ce71f7ab86..23741dbf918b084f161a88efc722bc5f047b452c 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -1243,6 +1243,11 @@ bool ChromeContentRendererClient::AllowPepperMediaStreamAPI(
 
 void ChromeContentRendererClient::AddKeySystems(
     std::vector<media::KeySystemInfo>* key_systems) {
+  AddChromeKeySystemsInfo(key_systems);
+}
+
+void ChromeContentRendererClient::AddSupportedKeySystems(
+    std::vector<std::unique_ptr<::media::KeySystemProperties>>* key_systems) {
   AddChromeKeySystems(key_systems);
 }