widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge latest oemcrypto-v17 change"

Browse Source 
This reverts commit 642965c678.

Reason for revert: Droidfood Blocking Bug: 217145027

Change-Id: I669b72fcd91c62e28883b5f55eb36af274d85806
(cherry picked from commit 8dbea15e5da05b371572297041454569dc166c90)
Merged-In:I669b72fcd91c62e28883b5f55eb36af274d85806
This commit is contained in:
Daniel Chapin
2022-01-31 19:21:18 +00:00
committed by Android Build Coastguard Worker
parent 1397b61f87
commit d69b488be1
176 changed files with 296842 additions and 301106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libwvdrmengine/cdm/core/test/test_base.h
View File

@@ -5,16 +5,16 @@
#ifndef WVCDM_CORE_TEST_BASE_H_
#define WVCDM_CORE_TEST_BASE_H_
#include <gtest/gtest.h>
#include <string>
#include <vector>
#include <gtest/gtest.h>
#include "cdm_engine.h"
#include "config_test_env.h"
#include "crypto_session.h"
#include "metrics_collections.h"
#include "oemcrypto_types.h"
#include "oec_session_util.h"
#include "string_conversions.h"
namespace wvcdm {
@@ -26,7 +26,7 @@ class WvCdmTestBase : public ::testing::Test {
~WvCdmTestBase() override {}
void SetUp() override;
virtual std::string binary_key_id() const {
return wvutil::a2bs_hex(config_.key_id());
return a2bs_hex(config_.key_id());
}
// Returns true if the test program should continue, if false, the caller
@@ -83,7 +83,7 @@ class WvCdmTestBase : public ::testing::Test {
// metrics and file system.
class TestCdmEngine : public CdmEngine {
public:
TestCdmEngine(wvutil::FileSystem* file_system,
TestCdmEngine(FileSystem* file_system,
std::shared_ptr<metrics::EngineMetrics> metrics)
: CdmEngine(file_system, metrics) {}
};
@@ -95,8 +95,8 @@ class WvCdmTestBaseWithEngine : public WvCdmTestBase {
cdm_engine_(&file_system_, dummy_engine_metrics_) {}
protected:
wvutil::FileSystem file_system_;
std::shared_ptr<metrics::EngineMetrics> dummy_engine_metrics_;
FileSystem file_system_;
shared_ptr<metrics::EngineMetrics> dummy_engine_metrics_;
TestCdmEngine cdm_engine_;
};
@@ -156,7 +156,6 @@ class TestLicenseHolder {
void AddMacKey();
CdmEngine* cdm_engine_;
uint32_t oemcrypto_api_;
std::string signed_license_request_data_;
std::string license_request_data_;
std::string session_id_;