Remove remaining uses of KeySystemInfo and InitDataTypeMask

media/blink/key_system_config_selector_unittest.cc

 // Copyright 2015 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/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 42 matching lines @@
     return false;
   }
 
   // TODO(sandersd): Move implementation into KeySystemConfigSelector?
   bool IsSupportedInitDataType(const std::string& key_system,
                                EmeInitDataType init_data_type) const override {
     switch (init_data_type) {
       case EmeInitDataType::UNKNOWN:
         return false;
       case EmeInitDataType::WEBM:
-        return (init_data_types & kInitDataTypeMaskWebM) != 0;
+        return init_data_type_webm_supported_;
       case EmeInitDataType::CENC:
-        return (init_data_types & kInitDataTypeMaskCenc) != 0;
+        return init_data_type_cenc_supported_;
       case EmeInitDataType::KEYIDS:
-        return (init_data_types & kInitDataTypeMaskKeyIds) != 0;
+        return init_data_type_keyids_supported_;
     }
     NOTREACHED();
     return false;
   }
 
   // TODO(sandersd): Secure codec simulation.
   EmeConfigRule GetContentTypeConfigRule(
       const std::string& key_system,
       EmeMediaType media_type,
       const std::string& container_mime_type,
@@ skipping 38 matching lines @@
   EmeFeatureSupport GetPersistentStateSupport(
       const std::string& key_system) const override {
     return persistent_state;
   }
 
   EmeFeatureSupport GetDistinctiveIdentifierSupport(
       const std::string& key_system) const override {
     return distinctive_identifier;
   }
 
-  InitDataTypeMask init_data_types = kInitDataTypeMaskNone;
+  bool init_data_type_webm_supported_ = false;
+  bool init_data_type_cenc_supported_ = false;
+  bool init_data_type_keyids_supported_ = false;
 
   // INVALID so that they must be set in any test that needs them.
   EmeSessionTypeSupport persistent_license = EmeSessionTypeSupport::INVALID;
   EmeSessionTypeSupport persistent_release_message =
       EmeSessionTypeSupport::INVALID;
 
   // Every test implicitly requires these, so they must be set. They are set to
   // values that are likely to cause tests to fail if they are accidentally
   // depended on. Test cases explicitly depending on them should set them, as
   // the default values may be changed.
@@ skipping 151 matching lines @@
 
 TEST_F(KeySystemConfigSelectorTest, InitDataTypes_Empty) {
   blink::WebMediaKeySystemConfiguration config;
   config.hasInitDataTypes = true;
   configs_.push_back(config);
 
   ASSERT_TRUE(SelectConfigReturnsError());
 }
 
 TEST_F(KeySystemConfigSelectorTest, InitDataTypes_NoneSupported) {
-  key_systems_->init_data_types = kInitDataTypeMaskWebM;
+  key_systems_->init_data_type_webm_supported_ = true;
 
   std::vector<blink::WebEncryptedMediaInitDataType> init_data_types;
   init_data_types.push_back(blink::WebEncryptedMediaInitDataType::Unknown);
   init_data_types.push_back(blink::WebEncryptedMediaInitDataType::Cenc);
 
   blink::WebMediaKeySystemConfiguration config;
   config.hasInitDataTypes = true;
   config.initDataTypes = init_data_types;
   configs_.push_back(config);
 
   ASSERT_TRUE(SelectConfigReturnsError());
 }
 
 TEST_F(KeySystemConfigSelectorTest, InitDataTypes_SubsetSupported) {
-  key_systems_->init_data_types = kInitDataTypeMaskWebM;
+  key_systems_->init_data_type_webm_supported_ = true;
 
   std::vector<blink::WebEncryptedMediaInitDataType> init_data_types;
   init_data_types.push_back(blink::WebEncryptedMediaInitDataType::Unknown);
   init_data_types.push_back(blink::WebEncryptedMediaInitDataType::Cenc);
   init_data_types.push_back(blink::WebEncryptedMediaInitDataType::Webm);
 
   blink::WebMediaKeySystemConfiguration config;
   config.hasInitDataTypes = true;
   config.initDataTypes = init_data_types;
   configs_.push_back(config);
@@ skipping 435 matching lines @@
 
   blink::WebMediaKeySystemConfiguration config2;
   config2.label = "b";
   configs_.push_back(config2);
 
   ASSERT_TRUE(SelectConfigRequestsPermissionAndReturnsConfig());
   ASSERT_EQ("b", config_.label);
 }
 
 }  // namespace media