Merge "Re-enable Binary Provisioning Test Again"

2019-01-17 00:30:42 +00:00
parent 3b328bb896 e12a837e14
commit 0c194ff115
2 changed files with 2 additions and 3 deletions
--- a/libwvdrmengine/cdm/core/test/test_base.cpp
+++ b/libwvdrmengine/cdm/core/test/test_base.cpp
@@ -204,8 +204,8 @@ class TestCryptoSessionFactory : public CryptoSessionFactory {

 void WvCdmTestBase::SetUp() {
  ::testing::Test::SetUp();
-  Properties::set_provisioning_messages_are_binary(binary_provisioning_);
  Properties::Init();
+  Properties::set_provisioning_messages_are_binary(binary_provisioning_);
  // Log the current test name, to help with debugging when the log and stdout
  // are not the same.
  const ::testing::TestInfo* const test_info =