Remove test keybox one more time

Merge from Widevine repo of http://go/wvgerrit/78883 Bug: 119316243 Test: unit tests Change-Id: Ic6748a6e020c2a4058510fb5c6c5a821e57cc5fd
2019-05-21 11:43:04 -07:00
parent 5764d3f801
commit aa7f7d3ac4
3 changed files with 4 additions and 50 deletions
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_session_tests_helper.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_session_tests_helper.cpp
@@ -105,8 +105,6 @@ void SessionUtil::EnsureTestKeys() {
  switch (global_features.derive_key_method) {
    case DeviceFeatures::LOAD_TEST_KEYBOX:
      keybox_ = kTestKeybox;
-      // TODO(fredgc, b/119316243): REMOVE FOLLOWING LINE:
-      if (global_features.api_version < 14) keybox_ = kTestKeyboxForV13;
      ASSERT_EQ(OEMCrypto_SUCCESS,
                OEMCrypto_LoadTestKeybox(
                    reinterpret_cast<const uint8_t*>(&keybox_),