From 49f518a911ccdc37c300f596f58ccffcd94988eb Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Sun, 11 Nov 2018 12:52:08 -0800 Subject: [PATCH] Always use configured client authentication [ Merge of http://go/wvgerrit/66002 ] Client authentication was needed when licenses were requested from the Play movies license service. For UAT/staging client authentication is set to the empty string. The play movies license service has not been used recently for testing. Also, client authentication has not been supported as one of the command line arguments. This was even before the command line parameters were consolidated in TestBase. Since it is not possible to specify client authentication on the command line, the configured(default) value is always used. This CL will remove code in the test to check if it has been specified on the command line. It can be added back later, if we decide to support client authentication as an option. b/119221644 Test: WV unit/integration tests Change-Id: I4a7fab5ec27b4897c9a73bd3ff34615d8ae11c28 --- libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp | 5 +---- libwvdrmengine/cdm/test/request_license_test.cpp | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp index ff79089a..f86fabc0 100644 --- a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp +++ b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp @@ -260,10 +260,7 @@ class WvCdmExtendedDurationTest : public WvCdmTestBase { else key_id->assign(config_.key_id()); - if (config_.client_auth().compare(config_.client_auth()) == 0) - client_auth->assign(config.client_auth()); - else - client_auth->assign(config_.client_auth()); + client_auth->assign(config.client_auth()); } void GenerateKeyRequest(const std::string& init_data, diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp index 203bbe0a..048a8888 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -1370,10 +1370,7 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase { else key_id->assign(binary_key_id()); - if (config_.client_auth().compare(config_.client_auth()) == 0) - client_auth->assign(config.client_auth()); - else - client_auth->assign(config_.client_auth()); + client_auth->assign(config.client_auth()); } void GenerateKeyRequest(const std::string& init_data,