Remove remaining uses of KeySystemInfo and InitDataTypeMask

content/renderer/media/render_media_client_unittest.cc

 // 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 <string>
 #include <vector>
 
 #include "base/test/simple_test_tick_clock.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/media/render_media_client.h"
 #include "content/test/test_content_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 namespace content {
 
 namespace {
 
+class TestKeySystemProperties : public media::KeySystemProperties {
+ public:
+  TestKeySystemProperties(const std::string& key_system_name)
+      : key_system_name_(key_system_name) {}
+
+  std::string GetKeySystemName() const override { return key_system_name_; }
+  bool IsSupportedInitDataType(
+      media::EmeInitDataType init_data_type) const override {
+    return false;
+  }
+  media::SupportedCodecs GetSupportedCodecs() const override {
+    return media::EME_CODEC_NONE;
+  }
+  media::EmeConfigRule GetRobustnessConfigRule(
+      media::EmeMediaType media_type,
+      const std::string& requested_robustness) const override {
+    return requested_robustness.empty() ? media::EmeConfigRule::SUPPORTED
+                                        : media::EmeConfigRule::NOT_SUPPORTED;
+  }
+  media::EmeSessionTypeSupport GetPersistentLicenseSessionSupport()
+      const override {
+    return media::EmeSessionTypeSupport::NOT_SUPPORTED;
+  }
+  media::EmeSessionTypeSupport GetPersistentReleaseMessageSessionSupport()
+      const override {
+    return media::EmeSessionTypeSupport::NOT_SUPPORTED;
+  }
+  media::EmeFeatureSupport GetPersistentStateSupport() const override {
+    return media::EmeFeatureSupport::NOT_SUPPORTED;
+  }
+  media::EmeFeatureSupport GetDistinctiveIdentifierSupport() const override {
+    return media::EmeFeatureSupport::NOT_SUPPORTED;
+  }
+
+ private:
+  const std::string key_system_name_;
+};
+
 class TestContentRendererClient : public ContentRendererClient {
  public:
   TestContentRendererClient() : is_extra_key_system_enabled_(false) {}
 
   // ContentRendererClient implementation.
-  void AddKeySystems(
-      std::vector<media::KeySystemInfo>* key_systems_info) override {
-    // TODO(sandersd): Was this supposed to be added to the list?
-    media::KeySystemInfo key_system_info;
-    key_system_info.key_system = "test.keysystem";
-    key_system_info.max_audio_robustness = media::EmeRobustness::EMPTY;
-    key_system_info.max_video_robustness = media::EmeRobustness::EMPTY;
-    key_system_info.persistent_license_support =
-        media::EmeSessionTypeSupport::NOT_SUPPORTED;
-    key_system_info.persistent_release_message_support =
-        media::EmeSessionTypeSupport::NOT_SUPPORTED;
-    key_system_info.persistent_state_support =
-        media::EmeFeatureSupport::NOT_SUPPORTED;
-    key_system_info.distinctive_identifier_support =
-        media::EmeFeatureSupport::NOT_SUPPORTED;
-    key_systems_info->push_back(key_system_info);
+  void AddSupportedKeySystems(
+      std::vector<std::unique_ptr<media::KeySystemProperties>>*
+          key_systems_properties) override {
+    key_systems_properties->emplace_back(
+        new TestKeySystemProperties("test.keysystem"));
+
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
     if (is_extra_key_system_enabled_) {
-      media::KeySystemInfo wv_key_system_info;
-      wv_key_system_info.key_system = kWidevineKeySystem;
-      wv_key_system_info.max_audio_robustness = media::EmeRobustness::EMPTY;
-      wv_key_system_info.max_video_robustness = media::EmeRobustness::EMPTY;
-      wv_key_system_info.persistent_license_support =
-          media::EmeSessionTypeSupport::NOT_SUPPORTED;
-      wv_key_system_info.persistent_release_message_support =
-          media::EmeSessionTypeSupport::NOT_SUPPORTED;
-      wv_key_system_info.persistent_state_support =
-          media::EmeFeatureSupport::NOT_SUPPORTED;
-      wv_key_system_info.distinctive_identifier_support =
-          media::EmeFeatureSupport::NOT_SUPPORTED;
-      key_systems_info->push_back(wv_key_system_info);
+      key_systems_properties->emplace_back(
+          new TestKeySystemProperties(kWidevineKeySystem));
     }
 #endif
   }
 
   void EnableExtraKeySystem() { is_extra_key_system_enabled_ = true; }
 
  private:
   // Whether a platform-specific extra key system is "supported" by |this|.
   bool is_extra_key_system_enabled_;
 };
@@ skipping 92 matching lines @@
 
   EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded());
   tick_clock->Advance(base::TimeDelta::FromMilliseconds(1000));
   EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded());
   tick_clock->Advance(base::TimeDelta::FromMilliseconds(1000));
   EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded());
 #endif
 }
 
 }  // namespace content