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

components/cdm/renderer/android_key_systems.h

Index: components/cdm/renderer/android_key_systems.h
diff --git a/components/cdm/renderer/android_key_systems.h b/components/cdm/renderer/android_key_systems.h
index fb962b15624c6d335dd82ad25867acfe10c0760b..f5111c7f35ee46e30543ee3d1bb3f7c2aa705dd8 100644
--- a/components/cdm/renderer/android_key_systems.h
+++ b/components/cdm/renderer/android_key_systems.h
@@ -5,19 +5,22 @@
 #ifndef COMPONENTS_CDM_RENDERER_ANDROID_KEY_SYSTEMS_H_
 #define COMPONENTS_CDM_RENDERER_ANDROID_KEY_SYSTEMS_H_
 
+#include <memory>
 #include <vector>
 
-#include "media/base/key_system_info.h"
+#include "media/base/key_system_properties.h"
 
 namespace cdm {
 
 void AddAndroidWidevine(
-    std::vector<media::KeySystemInfo>* concrete_key_systems);
+    std::vector<std::unique_ptr<media::KeySystemProperties>>*
+        concrete_key_systems);
 
 // Add platform-supported key systems which are not explicitly handled
 // by Chrome.
 void AddAndroidPlatformKeySystems(
-    std::vector<media::KeySystemInfo>* concrete_key_systems);
+    std::vector<std::unique_ptr<media::KeySystemProperties>>*
+        concrete_key_systems);
 
 }  // namespace cdm