Revert of Convert Widevine and Android platform key systems to KeySystemProperties

chrome/renderer/media/chrome_key_systems.h

Index: chrome/renderer/media/chrome_key_systems.h
diff --git a/chrome/renderer/media/chrome_key_systems.h b/chrome/renderer/media/chrome_key_systems.h
index ab1be5041ced22d35159298018c9a25b9bd69106..dfec84f3b39b2e1197c75c333e26ba5e08570ec7 100644
--- a/chrome/renderer/media/chrome_key_systems.h
+++ b/chrome/renderer/media/chrome_key_systems.h
@@ -5,23 +5,10 @@
 #ifndef CHROME_RENDERER_MEDIA_CHROME_KEY_SYSTEMS_H_
 #define CHROME_RENDERER_MEDIA_CHROME_KEY_SYSTEMS_H_
 
-#include <memory>
 #include <vector>
 
-namespace media {
-struct KeySystemInfo;
-class KeySystemProperties;
-}
+#include "media/base/key_system_info.h"
 
-// DEPRECATED: Register the key systems supported by populating
-// |key_systems_info|.  TODO(halliwell): move all key systems to
-// KeySystemProperties API.
-void AddChromeKeySystemsInfo(
-    std::vector<media::KeySystemInfo>* key_systems_info);
-
-// Register the key systems supported by populating |key_systems_properties|.
-void AddChromeKeySystems(
-    std::vector<std::unique_ptr<media::KeySystemProperties>>*
-        key_systems_properties);
+void AddChromeKeySystems(std::vector<media::KeySystemInfo>* key_systems_info);
 
 #endif  // CHROME_RENDERER_MEDIA_CHROME_KEY_SYSTEMS_H_