Fixed test and log formatting for CdmResponseType.

[ Merge of http://go/wvgerrit/168397 ]

When CdmResponseType (enum) was transformed to CdmResponseType
(struct), the test printers where not updated to print the result
of failed comparisons.  In addition, several logs statements were
updated haphazardly, leaving inconsistencies and potential
compiler-specific behavior.

This CL replaces CdmResponseType std::string operator with a ToString()
method.  This is to make it consistent with Google's C++ style guide
on conversion operators vs methods.  The string conversion function is
now defined in wv_cdm_types.cpp instead of inline in the header file.

The PrintTo function has been implemented along with the other CDM
test printers in test_printers.cpp.

Bug: 273989359
Test: run_x86_64_tests
Test: MediaDrmParameterizedTests on redfin
Test: Forrest drm_compliance
Change-Id: Ibfaa17029046b75b1c8c278f7bd7e04a24379848

libwvdrmengine/cdm/core/src/cdm_engine.cpp

@@ -423,7 +423,7 @@ CdmResponseType CdmEngine::AddKey(const CdmSessionId& session_id,
     }
   }
 
-  switch (sts.Enum()) {
+  switch (sts.code()) {
     case KEY_ADDED:
       break;
     case NEED_KEY:
@@ -863,11 +863,11 @@ CdmResponseType CdmEngine::QueryStatus(RequestedSecurityLevel security_level,
     }
     if (status == NOT_IMPLEMENTED_ERROR ||
         status == PROVISIONING_TYPE_IS_NOT_BOOT_CERTIFICATE_CHAIN_ERROR) {
-      LOGD("BCC not available: %d", static_cast<int>(status.Enum()));
+      LOGD("BCC not available: %d", status.ToInt());
       *query_response = QUERY_VALUE_NONE;
       return CdmResponseType(NO_ERROR);
     }
-    LOGE("Failed to extract BCC: status = %d", static_cast<int>(status.Enum()));
+    LOGE("Failed to extract BCC: status = %d", status.ToInt());
     return status;
   }
 
@@ -1471,7 +1471,7 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id,
   // try L3.
   CdmResponseType status =
       GetUsageInfo(app_id, ssid, kLevelDefault, error_detail, usage_info);
-  switch (status.Enum()) {
+  switch (status.code()) {
     case NEED_PROVISIONING:
     case GET_USAGE_INFO_ERROR_1:
     case GET_USAGE_INFO_ERROR_2:
@@ -1647,7 +1647,7 @@ CdmResponseType CdmEngine::GetUsageInfo(
   usage_info->clear();
   usage_info->push_back(request.message);
 
-  switch (status.Enum()) {
+  switch (status.code()) {
     case KEY_MESSAGE:
       break;
     case KEY_CANCELED:                      // usage information not present in
@@ -1853,7 +1853,7 @@ CdmResponseType CdmEngine::LoadUsageSession(const CdmKeySetId& key_set_id,
   CdmKeyRequest request;
   status = session->GenerateReleaseRequest(&request);
   *release_message = std::move(request.message);
-  switch (status.Enum()) {
+  switch (status.code()) {
     case KEY_MESSAGE:
       break;
     case KEY_CANCELED:

libwvdrmengine/cdm/core/src/cdm_session.cpp

@@ -323,7 +323,7 @@ CdmResponseType CdmSession::RestoreOfflineSession(const CdmKeySetId& key_set_id,
         license_data.drm_certificate, key_request_, key_response_);
 
     if (result != NO_ERROR) {
-      SetErrorDetail(error_detail, result.Enum());
+      SetErrorDetail(error_detail, result.code());
       return CdmResponseType(RELEASE_LICENSE_ERROR_1);
     }
   } else {
@@ -333,7 +333,7 @@ CdmResponseType CdmSession::RestoreOfflineSession(const CdmKeySetId& key_set_id,
         license_data.last_playback_time, license_data.grace_period_end_time,
         this);
     if (result != NO_ERROR) {
-      SetErrorDetail(error_detail, result.Enum());
+      SetErrorDetail(error_detail, result.code());
       return CdmResponseType(RESTORE_OFFLINE_LICENSE_ERROR_2);
     }
   }
@@ -1227,7 +1227,7 @@ CdmResponseType CdmSession::LoadPrivateKey(
       crypto_metrics_, crypto_session_load_certificate_private_key_,
       load_cert_sts);
 
-  switch (load_cert_sts.Enum()) {
+  switch (load_cert_sts.code()) {
     case NO_ERROR:
       metrics_->drm_certificate_key_type_.Record(
           DrmKeyTypeToMetricValue(private_key.type()));

libwvdrmengine/cdm/core/src/cdm_usage_table.cpp

@@ -205,7 +205,7 @@ bool CdmUsageTable::RestoreTable(CryptoSession* const crypto_session) {
   const CdmResponseType status =
       crypto_session->LoadUsageTableHeader(requested_security_level_, header_);
   if (status != NO_ERROR) {
-    LOGE("Failed to load usage table header: sts = %d", status.Enum());
+    LOGE("Failed to load usage table header: sts = %d", status.ToInt());
     return false;
   }
 
@@ -424,7 +424,7 @@ bool CdmUsageTable::OpenSessionCheck(CryptoSession* const crypto_session) {
     LOGE(
         "Cannot initialize usage table header with open crypto session: "
         "status = %d, count = %zu",
-        status.Enum(), session_count);
+        status.ToInt(), session_count);
     return false;
   }
   return true;
@@ -458,7 +458,7 @@ bool CdmUsageTable::CapacityCheck(CryptoSession* const crypto_session) {
       local_crypto_session->Open(requested_security_level_);
   if (status != NO_ERROR) {
     LOGE("Failed to open crypto session for capacity test: sts = %d",
-         status.Enum());
+         status.ToInt());
     return false;
   }
 
@@ -466,7 +466,7 @@ bool CdmUsageTable::CapacityCheck(CryptoSession* const crypto_session) {
   status = AddEntry(local_crypto_session, true, kDummyKeySetId, kEmptyString,
                     kEmptyString, &temporary_entry_index);
   if (status != NO_ERROR) {
-    LOGE("Failed to add entry for capacity test: sts = %d", status.Enum());
+    LOGE("Failed to add entry for capacity test: sts = %d", status.ToInt());
     return false;
   }
 
@@ -475,7 +475,7 @@ bool CdmUsageTable::CapacityCheck(CryptoSession* const crypto_session) {
                       /* defrag_table = */ true, device_files_.get(), metrics);
   if (status != NO_ERROR) {
     LOGE("Failed to invalidate entry for capacity test: sts = %d",
-         status.Enum());
+         status.ToInt());
     return false;
   }
   if (entry_info_list_.size() > temporary_entry_index) {
@@ -1017,7 +1017,7 @@ CdmResponseType CdmUsageTable::DefragTable(DeviceFiles* device_files,
 
     status = MoveEntry(from_entry_index, from_entry, to_entry_index,
                        device_files, metrics);
-    switch (status.Enum()) {
+    switch (status.code()) {
       case NO_ERROR: {
         entries_to_remove.pop_back();
         entries_to_move.pop_back();
@@ -1081,7 +1081,7 @@ CdmResponseType CdmUsageTable::DefragTable(DeviceFiles* device_files,
         // For all other cases, it may not be safe to proceed, even to
         // shrink the table.
         LOGE("Unrecoverable error occurred while defragging table: status = %d",
-             status.Enum());
+             status.ToInt());
         return status;
       }
     }  // End switch case.
@@ -1149,7 +1149,7 @@ CdmResponseType CdmUsageTable::ReleaseOldestEntry(
                               device_files_.get(), metrics);
 
   if (status != NO_ERROR) {
-    LOGE("Failed to invalidate oldest entry: status = %d", status.Enum());
+    LOGE("Failed to invalidate oldest entry: status = %d", status.ToInt());
     return status;
   }
 

libwvdrmengine/cdm/core/src/client_identification.cpp

@@ -140,7 +140,7 @@ CdmResponseType ClientIdentification::Prepare(
     CdmResponseType status =
         crypto_session_->GetProvisioningToken(&token, &additional_token);
     if (status != NO_ERROR) {
-      LOGE("Failed to get provisioning token: status = %d", status.Enum());
+      LOGE("Failed to get provisioning token: status = %d", status.ToInt());
       return status;
     }
     client_id->set_token(token);

libwvdrmengine/cdm/core/src/license.cpp

@@ -328,7 +328,7 @@ CdmResponseType CdmLicense::PrepareKeyRequest(
   // of the license response.
   status = crypto_session_->GenerateNonce(&license_nonce_);
 
-  switch (status.Enum()) {
+  switch (status.code()) {
     case NO_ERROR:
       break;
     case SESSION_LOST_STATE_ERROR:

libwvdrmengine/cdm/core/src/ota_keybox_provisioner.cpp

@@ -155,7 +155,7 @@ CdmResponseType OtaKeyboxProvisioner::GetProvisioningRequest(
     CleanUp();
     return result;
   } else if (result != NO_ERROR) {
-    LOGE("Failed to generate OKP request: status = %d", result.Enum());
+    LOGE("Failed to generate OKP request: status = %d", result.ToInt());
     return result;
   }
   // Step 2: Wrap in ProvisioningRequest.
@@ -164,7 +164,7 @@ CdmResponseType OtaKeyboxProvisioner::GetProvisioningRequest(
   result = client_id_.Prepare(kEmptyAppParameters, kEmptyString, client_id);
   if (result != NO_ERROR) {
     LOGW("Failed to prepare client ID, continuing without: result = %d",
-         result.Enum());
+         result.ToInt());
     client_id->Clear();
   }
   LOGI("OTA request generated");

libwvdrmengine/cdm/core/src/system_id_extractor.cpp

@@ -53,7 +53,7 @@ bool SystemIdExtractor::ExtractSystemId(uint32_t* system_id) {
       crypto_session_->GetProvisioningMethod(security_level_, &type);
   if (status != NO_ERROR) {
     LOGE("Failed to get provisioning method: security_level = %s, status = %d",
-         RequestedSecurityLevelToString(security_level_), status.Enum());
+         RequestedSecurityLevelToString(security_level_), status.ToInt());
     return false;
   }
   bool success = false;
@@ -121,7 +121,7 @@ bool SystemIdExtractor::ExtractSystemIdProv20(uint32_t* system_id) {
   }
   if (status != NO_ERROR) {
     LOGE("Failed to get keybox data: security_level = %s, status = %d",
-         RequestedSecurityLevelToString(security_level_), status.Enum());
+         RequestedSecurityLevelToString(security_level_), status.ToInt());
     return false;
   }
   if (!ExtractSystemIdFromKeyboxData(key_data, system_id)) {
@@ -137,7 +137,7 @@ bool SystemIdExtractor::ExtractSystemIdProv30(uint32_t* system_id) {
       crypto_session_->GetTokenFromOemCert(security_level_, &oem_cert);
   if (status != NO_ERROR) {
     LOGE("Failed to get OEM certificate: security_level = %s, status = %d",
-         RequestedSecurityLevelToString(security_level_), status.Enum());
+         RequestedSecurityLevelToString(security_level_), status.ToInt());
     return false;
   }
   if (!ExtractSystemIdFromOemCert(oem_cert, system_id)) {

libwvdrmengine/cdm/core/src/wv_cdm_types.cpp

@@ -4,6 +4,7 @@
 #include "wv_cdm_types.h"
 
 #include <stdio.h>
+#include <string.h>
 
 #include "wv_cdm_constants.h"
 
@@ -24,6 +25,34 @@ const char* UnknownValueRep(EnumType value) {
 }
 }  // namespace
 
+const char* CdmResponseType::GetCodeString() const {
+  return CdmResponseEnumToString(code_);
+}
+
+bool CdmResponseType::operator==(const CdmResponseType& other) const {
+  if (code_ != other.code_) return false;
+  if (!HasOemcResult() || !other.HasOemcResult())
+    return !HasOemcResult() && !other.HasOemcResult();
+  if (oemc_result_ != other.oemc_result_) return false;
+  if (!HasCryptoSessionMethod() || !other.HasCryptoSessionMethod())
+    return !HasCryptoSessionMethod() && !other.HasCryptoSessionMethod();
+  return strcmp(crypto_session_method_, other.crypto_session_method_) == 0;
+}
+
+std::string CdmResponseType::ToString() const {
+  std::string result = CdmResponseEnumToString(code_);
+  if (!HasOemcResult()) return result;
+  // TODO(sigquit): Consider using a string representation of OEMCryptoResult.
+  result.append(" (oemc_result = ");
+  result.append(std::to_string(oemc_result_));
+  if (HasCryptoSessionMethod()) {
+    result.append(", method = ");
+    result.append(crypto_session_method_);
+  }
+  result.append(")");
+  return result;
+}
+
 const char* CdmCertificateTypeToString(CdmCertificateType type) {
   switch (type) {
     case kCertificateWidevine: