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

Test Cleanup

Browse Source 
Some tests code was not correctly merged from the widevine side.

An initializer in generic_crypto_unittest.cpp was missed in
http://go/wvgerrit/23767

bug: 35951647

Change-Id: I2f7052b621989a032179346edf43dcaf6cb7d921
This commit is contained in:
Fred Gylys-Colwell
2017-03-02 17:01:10 -08:00
parent ce535ad21e
commit 9bd9bcd61a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libwvdrmengine/cdm/core/src/device_files.cpp
View File

@@ -701,7 +701,6 @@ bool DeviceFiles::RetrieveUsageInfo(const std::string& usage_info_file_name,
bool DeviceFiles::RetrieveUsageInfo(const std::string& usage_info_file_name, bool DeviceFiles::RetrieveUsageInfo(const std::string& usage_info_file_name,
const std::string& provider_session_token, const std::string& provider_session_token,
CdmUsageData* usage_data) { CdmUsageData* usage_data) {
if (!initialized_) { if (!initialized_) {
LOGW("DeviceFiles::RetrieveUsageInfo: not initialized"); LOGW("DeviceFiles::RetrieveUsageInfo: not initialized");
return false; return false;

2
libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp
View File

@@ -30,6 +30,8 @@ namespace wvcdm {
class WvGenericOperationsTest : public testing::Test { class WvGenericOperationsTest : public testing::Test {
public: public:
WvGenericOperationsTest() : crypto_session_(NULL) {}
virtual void SetUp() { virtual void SetUp() {
::testing::Test::SetUp(); ::testing::Test::SetUp();