From 093fd4718c666b9a4aa81233bc1bc12a43ff891d Mon Sep 17 00:00:00 2001
From: Alex Dale <sigquit@google.com>
Date: Tue, 26 Nov 2019 13:19:28 -0800
Subject: [PATCH] Removed a few more log prefixes in core/

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

Test: Android and Linux unit tests
Bug: 134460638
Change-Id: Ieb84296eefd00478260ebc42d242f9bef2d8c8d1
---
 libwvdrmengine/cdm/core/include/cdm_engine_metrics_decorator.h | 2 +-
 libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp      | 2 +-
 libwvdrmengine/cdm/core/test/test_base.cpp                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libwvdrmengine/cdm/core/include/cdm_engine_metrics_decorator.h b/libwvdrmengine/cdm/core/include/cdm_engine_metrics_decorator.h
index 9df54cd5..0189a75d 100644
--- a/libwvdrmengine/cdm/core/include/cdm_engine_metrics_decorator.h
+++ b/libwvdrmengine/cdm/core/include/cdm_engine_metrics_decorator.h
@@ -121,7 +121,7 @@ class CdmEngineMetricsImpl : public T {
                          CdmLicenseType* license_type,
                          CdmKeySetId* key_set_id) override {
     if (license_type == nullptr) {
-      LOGE("CdmEngine::AddKey: license_type cannot be null.");
+      LOGE("|license_type| cannot be null");
       return PARAMETER_NULL;
     }
 
diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
index 94e19c74..8c893611 100644
--- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
+++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
@@ -406,7 +406,7 @@ class WatchDog {
     std::string path;
     if (!wvcdm::Properties::GetDeviceFilesBasePath(wvcdm::kSecurityLevelL3,
                                                    &path)) {
-      LOGW("WatchDog::FailureFilename: Unable to get base path");
+      LOGW("WatchDog: Unable to get base path");
       return "/data/l3_failure_file";
     }
     path += "l3_failure_file";
diff --git a/libwvdrmengine/cdm/core/test/test_base.cpp b/libwvdrmengine/cdm/core/test/test_base.cpp
index acc08317..a73b715c 100644
--- a/libwvdrmengine/cdm/core/test/test_base.cpp
+++ b/libwvdrmengine/cdm/core/test/test_base.cpp
@@ -288,7 +288,7 @@ void WvCdmTestBase::Provision(size_t max_attempts) {
         binary_prov_request.begin(), binary_prov_request.end())));
   }
 
-  LOGV("WvCdmTestBase::Provision: req=%s", prov_request.c_str());
+  LOGV("Provisioning request: req = %s", prov_request.c_str());
 
   // Ignore URL provided by CdmEngine.  Use ours, as configured
   // for test vs. production server.