Simplify/Cleanup MediaClient

chromecast/renderer/key_systems_cast.cc

Index: chromecast/renderer/key_systems_cast.cc
diff --git a/chromecast/renderer/key_systems_cast.cc b/chromecast/renderer/key_systems_cast.cc
deleted file mode 100644
index 8ea79eb84c8ebf2412f7602f7fec9d006ad7622e..0000000000000000000000000000000000000000
--- a/chromecast/renderer/key_systems_cast.cc
+++ /dev/null
@@ -1,131 +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.
-
-#include "chromecast/renderer/key_systems_cast.h"
-
-#include <string>
-
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "build/build_config.h"
-#include "chromecast/media/base/key_systems_common.h"
-#include "components/cdm/renderer/android_key_systems.h"
-#include "components/cdm/renderer/widevine_key_system_properties.h"
-#include "media/base/eme_constants.h"
-#include "media/base/key_system_properties.h"
-#include "media/media_features.h"
-
-#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
-
-using ::media::EmeConfigRule;
-using ::media::EmeFeatureSupport;
-using ::media::EmeInitDataType;
-using ::media::EmeMediaType;
-using ::media::EmeSessionTypeSupport;
-using ::media::SupportedCodecs;
-
-namespace chromecast {
-namespace shell {
-namespace {
-
-#if defined(PLAYREADY_CDM_AVAILABLE)
-class PlayReadyKeySystemProperties : public ::media::KeySystemProperties {
- public:
-  explicit PlayReadyKeySystemProperties(bool persistent_license_support)
-      : persistent_license_support_(persistent_license_support) {
-  }
-
-  std::string GetKeySystemName() const override {
-    return media::kChromecastPlayreadyKeySystem;
-  }
-
-  bool IsSupportedInitDataType(EmeInitDataType init_data_type) const override {
-    return init_data_type == EmeInitDataType::CENC;
-  }
-
-  SupportedCodecs GetSupportedCodecs() const override {
-    SupportedCodecs codecs =
-        ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1;
-#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
-    codecs |= ::media::EME_CODEC_MP4_HEVC;
-#endif
-    return codecs;
-  }
-
-  EmeConfigRule GetRobustnessConfigRule(
-      EmeMediaType media_type,
-      const std::string& requested_robustness) const override {
-    return requested_robustness.empty() ? EmeConfigRule::SUPPORTED
-                                        : EmeConfigRule::NOT_SUPPORTED;
-  }
-
-  EmeSessionTypeSupport GetPersistentLicenseSessionSupport() const override {
-    return persistent_license_support_ ? EmeSessionTypeSupport::SUPPORTED
-        : EmeSessionTypeSupport::NOT_SUPPORTED;
-  }
-
-  EmeSessionTypeSupport GetPersistentReleaseMessageSessionSupport()
-      const override {
-    return EmeSessionTypeSupport::NOT_SUPPORTED;
-  }
-
-  EmeFeatureSupport GetPersistentStateSupport() const override {
-    return EmeFeatureSupport::ALWAYS_ENABLED;
-  }
-  EmeFeatureSupport GetDistinctiveIdentifierSupport() const override {
-    return EmeFeatureSupport::ALWAYS_ENABLED;
-  }
-
- private:
-  const bool persistent_license_support_;
-};
-#endif  // PLAYREADY_CDM_AVAILABLE
-
-}  // namespace
-
-void AddChromecastKeySystems(
-    std::vector<std::unique_ptr<::media::KeySystemProperties>>*
-        key_systems_properties,
-    bool enable_persistent_license_support,
-    bool force_software_crypto) {
-#if defined(PLAYREADY_CDM_AVAILABLE)
-  bool enable_persistent_license_playready = enable_persistent_license_support;
-#if defined(OS_ANDROID)
-  LOG_IF(WARNING, enable_persistent_license_playready)
-      << "Android doesn't support Playready persistent license.";
-  enable_persistent_license_playready = false;
-#endif
-  key_systems_properties->emplace_back(
-      new PlayReadyKeySystemProperties(enable_persistent_license_playready));
-#endif  // defined(PLAYREADY_CDM_AVAILABLE)
-
-#if defined(WIDEVINE_CDM_AVAILABLE)
-#if defined(OS_ANDROID)
-  cdm::AddAndroidWidevine(key_systems_properties);
-#else
-  using Robustness = cdm::WidevineKeySystemProperties::Robustness;
-  ::media::SupportedCodecs codecs =
-      ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1 |
-      ::media::EME_CODEC_MP4_VP9 | ::media::EME_CODEC_WEBM_VP8 |
-      ::media::EME_CODEC_WEBM_VP9;
-#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
-  codecs |= ::media::EME_CODEC_MP4_HEVC;
-#endif
-  key_systems_properties->emplace_back(new cdm::WidevineKeySystemProperties(
-      codecs,  // Regular codecs.
-      Robustness::HW_SECURE_ALL,  // Max audio robustness.
-      Robustness::HW_SECURE_ALL,  // Max video robustness.
-      enable_persistent_license_support
-          ? EmeSessionTypeSupport::SUPPORTED
-          : EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-license.
-      EmeSessionTypeSupport::NOT_SUPPORTED,  // persistent-release-message.
-      // Note: On Chromecast, all CDMs may have persistent state.
-      EmeFeatureSupport::ALWAYS_ENABLED,    // Persistent state.
-      EmeFeatureSupport::ALWAYS_ENABLED));  // Distinctive identifier.
-#endif  // defined(OS_ANDROID)
-#endif  // defined(WIDEVINE_CDM_AVAILABLE)
-}
-
-}  // namespace shell
-}  // namespace chromecast