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

android_webview/renderer/aw_key_systems.cc

Index: android_webview/renderer/aw_key_systems.cc
diff --git a/android_webview/renderer/aw_key_systems.cc b/android_webview/renderer/aw_key_systems.cc
index cc3059e4a8b176fd9a7c7e607e8dfbb1aa3d7810..6a81cb1512552a957e35c63a445b96b10f8ea408 100644
--- a/android_webview/renderer/aw_key_systems.cc
+++ b/android_webview/renderer/aw_key_systems.cc
@@ -7,10 +7,10 @@
 
 namespace android_webview {
 
-void AwAddKeySystems(
-    std::vector<media::KeySystemInfo>* key_systems_info) {
-  cdm::AddAndroidWidevine(key_systems_info);
-  cdm::AddAndroidPlatformKeySystems(key_systems_info);
+void AwAddKeySystems(std::vector<std::unique_ptr<media::KeySystemProperties>>*
+                         key_systems_properties) {
+  cdm::AddAndroidWidevine(key_systems_properties);
+  cdm::AddAndroidPlatformKeySystems(key_systems_properties);
 }
 
 }  // namespace android_webview