Revert of Convert Widevine and Android platform key systems to KeySystemProperties

chrome/renderer/media/chrome_key_systems.cc

 // Copyright 2013 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.
 
 #include "chrome/renderer/media/chrome_key_systems.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/common/render_messages.h"
+#include "components/cdm/renderer/widevine_key_systems.h"
 #include "content/public/renderer/render_thread.h"
 #include "media/base/eme_constants.h"
-#include "media/base/key_system_info.h"
-#include "media/base/key_system_properties.h"
-
 #include "media/media_features.h"
 
 #if defined(OS_ANDROID)
 #include "components/cdm/renderer/android_key_systems.h"
 #endif
 
 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
 
 // The following must be after widevine_cdm_version.h.
 
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
 #include <gnu/libc-version.h>
 #include "base/version.h"
 #endif
 
 using media::KeySystemInfo;
-using media::KeySystemProperties;
 using media::SupportedCodecs;
 
 #if defined(ENABLE_PEPPER_CDMS)
 static bool IsPepperCdmAvailable(
     const std::string& pepper_type,
     std::vector<base::string16>* additional_param_names,
     std::vector<base::string16>* additional_param_values) {
   bool is_available = false;
   content::RenderThread::Get()->Send(
       new ChromeViewHostMsg_IsInternalPluginAvailableForMimeType(
@@ skipping 96 matching lines @@
       }
       *codecs = base::SplitString(
           codecs_string, std::string(1, kCdmSupportedCodecsValueDelimiter),
           base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
       break;
     }
   }
 }
 
 static void AddPepperBasedWidevine(
-    std::vector<std::unique_ptr<KeySystemProperties>>* concrete_key_systems) {
+    std::vector<KeySystemInfo>* concrete_key_systems) {
 #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
   Version glibc_version(gnu_get_libc_version());
   DCHECK(glibc_version.IsValid());
   if (glibc_version < base::Version(WIDEVINE_CDM_MIN_GLIBC_VERSION))
     return;
 #endif  // defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
 
   std::vector<base::string16> additional_param_names;
   std::vector<base::string16> additional_param_values;
   if (!IsPepperCdmAvailable(kWidevineCdmPluginMimeType,
@@ skipping 27 matching lines @@
 #if defined(USE_PROPRIETARY_CODECS)
     if (codecs[i] == kCdmSupportedCodecAvc1)
       supported_codecs |= media::EME_CODEC_MP4_AVC1;
 #if BUILDFLAG(ENABLE_MP4_VP9_DEMUXING)
     if (codecs[i] == kCdmSupportedCodecVp9)
       supported_codecs |= media::EME_CODEC_MP4_VP9;
 #endif
 #endif  // defined(USE_PROPRIETARY_CODECS)
   }
 
-  concrete_key_systems->emplace_back(new cdm::WidevineKeySystemProperties(
+  cdm::AddWidevineWithCodecs(
       supported_codecs,
 #if defined(OS_CHROMEOS)
       media::EmeRobustness::HW_SECURE_ALL,  // Maximum audio robustness.
       media::EmeRobustness::HW_SECURE_ALL,  // Maximim video robustness.
       media::EmeSessionTypeSupport::
           SUPPORTED_WITH_IDENTIFIER,  // Persistent-license.
       media::EmeSessionTypeSupport::
-          NOT_SUPPORTED,                        // Persistent-release-message.
-      media::EmeFeatureSupport::REQUESTABLE,    // Persistent state.
-      media::EmeFeatureSupport::REQUESTABLE));  // Distinctive identifier.
+          NOT_SUPPORTED,                      // Persistent-release-message.
+      media::EmeFeatureSupport::REQUESTABLE,  // Persistent state.
+      media::EmeFeatureSupport::REQUESTABLE,  // Distinctive identifier.
 #else   // (Desktop)
       media::EmeRobustness::SW_SECURE_CRYPTO,       // Maximum audio robustness.
       media::EmeRobustness::SW_SECURE_DECODE,       // Maximum video robustness.
       media::EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-license.
       media::EmeSessionTypeSupport::
-          NOT_SUPPORTED,                          // persistent-release-message.
-      media::EmeFeatureSupport::REQUESTABLE,      // Persistent state.
-      media::EmeFeatureSupport::NOT_SUPPORTED));  // Distinctive identifier.
+          NOT_SUPPORTED,                        // persistent-release-message.
+      media::EmeFeatureSupport::REQUESTABLE,    // Persistent state.
+      media::EmeFeatureSupport::NOT_SUPPORTED,  // Distinctive identifier.
 #endif  // defined(OS_CHROMEOS)
+      concrete_key_systems);
 }
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
-void AddChromeKeySystemsInfo(std::vector<KeySystemInfo>* key_systems_info) {
+void AddChromeKeySystems(std::vector<KeySystemInfo>* key_systems_info) {
 #if defined(ENABLE_PEPPER_CDMS)
   AddExternalClearKey(key_systems_info);
-#endif
-}
 
-void AddChromeKeySystems(
-    std::vector<std::unique_ptr<KeySystemProperties>>* key_systems_properties) {
-#if defined(ENABLE_PEPPER_CDMS)
 #if defined(WIDEVINE_CDM_AVAILABLE)
-  AddPepperBasedWidevine(key_systems_properties);
+  AddPepperBasedWidevine(key_systems_info);
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 #if defined(OS_ANDROID)
-  cdm::AddAndroidWidevine(key_systems_properties);
+  cdm::AddAndroidWidevine(key_systems_info);
 #endif  // defined(OS_ANDROID)
 }