From 9bd9bcd61a7526bf2d9348bb1fb04cff1bd33eb4 Mon Sep 17 00:00:00 2001
From: Fred Gylys-Colwell <fredgc@google.com>
Date: Thu, 2 Mar 2017 17:01:10 -0800
Subject: [PATCH] Test Cleanup

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
---
 libwvdrmengine/cdm/core/src/device_files.cpp             | 1 -
 libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libwvdrmengine/cdm/core/src/device_files.cpp b/libwvdrmengine/cdm/core/src/device_files.cpp
index 28fd0222..963198a5 100644
--- a/libwvdrmengine/cdm/core/src/device_files.cpp
+++ b/libwvdrmengine/cdm/core/src/device_files.cpp
@@ -701,7 +701,6 @@ 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,
                                     CdmUsageData* usage_data) {
-
   if (!initialized_) {
     LOGW("DeviceFiles::RetrieveUsageInfo: not initialized");
     return false;
diff --git a/libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp b/libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp
index 37a03fb3..2fac894a 100644
--- a/libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp
@@ -30,6 +30,8 @@ namespace wvcdm {
 
 class WvGenericOperationsTest : public testing::Test {
  public:
+  WvGenericOperationsTest() : crypto_session_(NULL) {}
+
   virtual void SetUp() {
     ::testing::Test::SetUp();