From 909887923d395f23c0356607da32ac93b73d6e5a Mon Sep 17 00:00:00 2001
From: Fred Gylys-Colwell <fredgc@google.com>
Date: Tue, 12 Aug 2014 14:14:46 -0700
Subject: [PATCH] OEMCrypto_DeleteUsageTable now returns OEMCrypto_SUCCESS

Copy of widevine change:
https://widevine-internal-review.googlesource.com/#/c/10911/

OEMCrypto_DeleteUsageTable used to return an error on every call
because UsageTable::Clear always returned false.  Since there is no
error checking that Clear can do, its return type has been changed to
void, and DeleteUsageTable now returns OEMCrypto_SUCCESS for all
calls.

bug: 16799906
Change-Id: Iaa2f572e4b0feb554877579596a7f43a64d20954
---
 libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp        | 6 ++----
 .../oemcrypto/mock/src/oemcrypto_usage_table_mock.cpp       | 3 +--
 .../oemcrypto/mock/src/oemcrypto_usage_table_mock.h         | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp
index f19e653a..2efe926f 100644
--- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp
+++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp
@@ -1277,10 +1277,8 @@ OEMCryptoResult OEMCrypto_DeleteUsageTable() {
   if (LogCategoryEnabled(kLoggingTraceOEMCryptoCalls)) {
     LOGI("-- OEMCryptoResult OEMCrypto_DeleteUsageTable()\n");
   }
-  if (crypto_engine->usage_table()->Clear()) {
-    return OEMCrypto_SUCCESS;
-  }
-  return OEMCrypto_ERROR_UNKNOWN_FAILURE;
+  crypto_engine->usage_table()->Clear();
+  return OEMCrypto_SUCCESS;
 }
 
 };  // namespace wvoec_mock
diff --git a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.cpp b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.cpp
index 0260fdfe..10c9a90d 100644
--- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.cpp
+++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.cpp
@@ -406,13 +406,12 @@ bool UsageTable::DeleteEntry(const std::vector<uint8_t> &pst) {
   return SaveToFile();
 }
 
-bool UsageTable::Clear() {
+void UsageTable::Clear() {
   wvcdm::AutoLock lock(lock_);
   for (EntryMap::iterator i = table_.begin(); i != table_.end(); ++i) {
     if (i->second) delete i->second;
   }
   table_.clear();
-  return false;
 }
 
 bool UsageTable::ComputeHash(const std::vector<uint8_t> &pst,
diff --git a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.h b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.h
index 19033c60..7f222e8f 100644
--- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.h
+++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.h
@@ -86,7 +86,7 @@ class UsageTable {
   OEMCryptoResult UpdateTable();
   OEMCryptoResult DeactivateEntry(const std::vector<uint8_t> &pst);
   bool DeleteEntry(const std::vector<uint8_t> &pst);
-  bool Clear();
+  void Clear();
 
  private:
   UsageTableEntry *FindEntryLocked(const std::vector<uint8_t> &pst);