Remove remaining uses of KeySystemInfo and InitDataTypeMask

media/base/key_system_properties.h

 // 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.
 
 #ifndef MEDIA_BASE_KEY_SYSTEM_PROPERTIES_H_
 #define MEDIA_BASE_KEY_SYSTEM_PROPERTIES_H_
 
 #include <string>
 
-#include "build/build_config.h"
 #include "media/base/eme_constants.h"
-#include "media/base/key_system_info.h"
 #include "media/base/media_export.h"
 
 namespace media {
 
 // Provides an interface for querying the properties of a registered key system.
 class MEDIA_EXPORT KeySystemProperties {
  public:
   virtual ~KeySystemProperties() {}
 
   // Gets the name of this key system.
@@ skipping 28 matching lines @@
 
   // Returns the support this key system provides for distinctive identifiers.
   virtual EmeFeatureSupport GetDistinctiveIdentifierSupport() const = 0;
 
   // Returns whether AesDecryptor can be used for this key system.
   virtual bool UseAesDecryptor() const;
 
   virtual std::string GetPepperType() const;
 };
 
-// TODO(halliwell): remove this before M52.  Replace with subclasses that
-// directly implement the different cases (e.g. ClearKey, Widevine, Cast).
-class MEDIA_EXPORT InfoBasedKeySystemProperties : public KeySystemProperties {
- public:
-  InfoBasedKeySystemProperties(const KeySystemInfo& info);
-
-  std::string GetKeySystemName() const override;
-  bool IsSupportedInitDataType(EmeInitDataType init_data_type) const override;
-
-  SupportedCodecs GetSupportedCodecs() const override;
-#if defined(OS_ANDROID)
-  SupportedCodecs GetSupportedSecureCodecs() const override;
-#endif
-
-  EmeConfigRule GetRobustnessConfigRule(
-      EmeMediaType media_type,
-      const std::string& requested_robustness) const override;
-  EmeSessionTypeSupport GetPersistentLicenseSessionSupport() const override;
-  EmeSessionTypeSupport GetPersistentReleaseMessageSessionSupport()
-      const override;
-  EmeFeatureSupport GetPersistentStateSupport() const override;
-  EmeFeatureSupport GetDistinctiveIdentifierSupport() const override;
-  bool UseAesDecryptor() const override;
-
-#if defined(ENABLE_PEPPER_CDMS)
-  std::string GetPepperType() const override;
-#endif
-
- private:
-  const KeySystemInfo info_;
-};
-
 }  // namespace media
 
 #endif  // MEDIA_BASE_KEY_SYSTEM_PROPERTIES_H_