Source release 19.3.0
This commit is contained in:
@@ -169,7 +169,7 @@ bool SendPost(const std::string& message, std::string* response) {
|
||||
|
||||
std::unique_ptr<Cdm> CreateCdm(EventListener* event_listener) {
|
||||
std::unique_ptr<Cdm> ret(
|
||||
create_func(event_listener, &g_host->per_origin_storage(), true));
|
||||
create_func(event_listener, &g_host->per_origin_storage(), true, false));
|
||||
if (ret) {
|
||||
EXPECT_SUCCESS(ret->setServiceCertificate(
|
||||
Cdm::kProvisioningService,
|
||||
@@ -182,8 +182,7 @@ std::unique_ptr<Cdm> CreateCdm(EventListener* event_listener) {
|
||||
|
||||
class GlobalEnv : public testing::Environment {
|
||||
public:
|
||||
GlobalEnv(InitFuncType init_func, const std::string& cert)
|
||||
: init_func_(init_func), cert_(cert) {}
|
||||
GlobalEnv(InitFuncType init_func) : init_func_(init_func) {}
|
||||
|
||||
void SetUp() override {
|
||||
// Manually set the logger because `TestHost` makes logging calls before
|
||||
@@ -191,7 +190,6 @@ class GlobalEnv : public testing::Environment {
|
||||
g_logger = &g_stderr_logger;
|
||||
|
||||
g_host = new TestHost;
|
||||
if (!cert_.empty()) g_host->per_origin_storage().write("cert.bin", cert_);
|
||||
|
||||
Cdm::LogLevel log_level = Cdm::kErrors;
|
||||
if (const char* verbose = getenv("VERBOSE_OUTPUT")) {
|
||||
@@ -203,7 +201,6 @@ class GlobalEnv : public testing::Environment {
|
||||
|
||||
private:
|
||||
const InitFuncType init_func_;
|
||||
const std::string cert_;
|
||||
};
|
||||
|
||||
} // namespace
|
||||
@@ -331,8 +328,7 @@ std::string PrintDecryptParam(const testing::TestParamInfo<bool>& info) {
|
||||
INSTANTIATE_TEST_SUITE_P(Decrypt, DecryptPerfTest, testing::Bool(),
|
||||
PrintDecryptParam);
|
||||
|
||||
int PerfTestMain(InitFuncType init_func, CreateFuncType create,
|
||||
const std::string& cert) {
|
||||
int PerfTestMain(InitFuncType init_func, CreateFuncType create) {
|
||||
#ifdef _DEBUG
|
||||
// Don't use #error since we build all targets and we don't want to fail the
|
||||
// debug build (and we can't have configuration-specific targets).
|
||||
@@ -340,7 +336,7 @@ int PerfTestMain(InitFuncType init_func, CreateFuncType create,
|
||||
return 1;
|
||||
#else
|
||||
create_func = create;
|
||||
testing::AddGlobalTestEnvironment(new GlobalEnv(init_func, cert));
|
||||
testing::AddGlobalTestEnvironment(new GlobalEnv(init_func));
|
||||
|
||||
return RUN_ALL_TESTS();
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user