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

components/cdm/renderer/widevine_key_systems.h

Index: components/cdm/renderer/widevine_key_systems.h
diff --git a/components/cdm/renderer/widevine_key_systems.h b/components/cdm/renderer/widevine_key_systems.h
deleted file mode 100644
index e50f7e6eb6c3830d7560c5e35800d228762017aa..0000000000000000000000000000000000000000
--- a/components/cdm/renderer/widevine_key_systems.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef COMPONENTS_CDM_RENDERER_WIDEVINE_KEY_SYSTEMS_H_
-#define COMPONENTS_CDM_RENDERER_WIDEVINE_KEY_SYSTEMS_H_
-
-#include <vector>
-
-#include "build/build_config.h"
-#include "media/base/key_system_info.h"
-
-namespace cdm {
-
-void AddWidevineWithCodecs(
-    media::SupportedCodecs supported_codecs,
-#if defined(OS_ANDROID)
-    media::SupportedCodecs supported_secure_codecs,
-#endif  // defined(OS_ANDROID)
-    media::EmeRobustness max_audio_robustness,
-    media::EmeRobustness max_video_robustness,
-    media::EmeSessionTypeSupport persistent_license_support,
-    media::EmeSessionTypeSupport persistent_release_message_support,
-    media::EmeFeatureSupport persistent_state_support,
-    media::EmeFeatureSupport distinctive_identifier_support,
-    std::vector<media::KeySystemInfo>* concrete_key_systems);
-
-}  // namespace cdm
-
-#endif  // COMPONENTS_CDM_RENDERER_WIDEVINE_KEY_SYSTEMS_H_