Merge "Replace generic OnEvent with actual event callbacks"

2015-03-30 17:35:23 +00:00
parent d78a0696bb 85e838b957
commit 2f86c447a4
15 changed files with 371 additions and 463 deletions
--- a/libwvdrmengine/cdm/core/test/license_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/license_unittest.cpp
@@ -105,7 +105,8 @@ class MockCryptoSession : public CryptoSession {

 class MockPolicyEngine : public PolicyEngine {
 public:
-  MockPolicyEngine(CryptoSession* crypto) : PolicyEngine(crypto) {}
+  MockPolicyEngine(CryptoSession* crypto)
+      : PolicyEngine("mock_session_id", NULL, crypto) {}
 };

 class MockClock : public Clock {