Merge changes I2f7052b6,Ifbfaf97c

* changes:
  Test Cleanup
  Report error OEMCrypto_ERROR_ENTRY_IN_USE

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;

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();