Remove remaining uses of KeySystemInfo and InitDataTypeMask

content/renderer/media/render_media_client.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 "content/renderer/media/render_media_client.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/time/default_tick_clock.h"
 #include "content/public/common/content_client.h"
 #include "content/public/renderer/content_renderer_client.h"
-#include "media/base/key_system_info.h"
 
 namespace content {
 
 static base::LazyInstance<RenderMediaClient>::Leaky g_render_media_client =
     LAZY_INSTANCE_INITIALIZER;
 
 void RenderMediaClient::Initialize() {
   g_render_media_client.Get();
 }
 
@@ skipping 41 matching lines @@
 
   return true;
 }
 
 void RenderMediaClient::AddSupportedKeySystems(
     std::vector<std::unique_ptr<media::KeySystemProperties>>*
         key_systems_properties) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  std::vector<media::KeySystemInfo> key_systems_info;
-  GetContentClient()->renderer()->AddKeySystems(&key_systems_info);
-  for (const auto& info : key_systems_info) {
-    key_systems_properties->emplace_back(
-        new media::InfoBasedKeySystemProperties(info));
-  }
   GetContentClient()->renderer()->AddSupportedKeySystems(
       key_systems_properties);
 
   has_updated_ = true;
   last_update_time_ticks_ = tick_clock_->NowTicks();
 
   // Check whether all potentially supported key systems are supported. If so,
   // no need to update again.
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
   for (const auto& properties : *key_systems_properties) {
@@ skipping 18 matching lines @@
 // This functions is for testing purpose only. The declaration in the
 // header file is guarded by "#if defined(UNIT_TEST)" so that it can be used
 // by tests but not non-test code. However, this .cc file is compiled as part of
 // "content" where "UNIT_TEST" is not defined. So we need to specify
 // "CONTENT_EXPORT" here again so that it is visible to tests.
 CONTENT_EXPORT RenderMediaClient* GetRenderMediaClientInstanceForTesting() {
   return g_render_media_client.Pointer();
 }
 
 }  // namespace content