Only one function for reporting usage support.

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

Replaced the two usage support functions GetUsageSupportType() and
UsageInformationSupport() into a single function HasUsageInfoSupport().

Since moving to only supporting a single usage info system (usage table
header + usage entries), the different usage support functions have
lost their purpose.

One version of the method works on an open session and will use a
cached value of the property if previously set.  The other can be
called without opening the session (as used for query calls).

This is part of larger fix for the usage table initialization process.

Bug: 169195093
Test: CE CDM unit tests
Change-Id: I637c24dd143e995dbb0f8848850e3c71ff1018eb

libwvdrmengine/cdm/core/src/cdm_engine.cpp

@@ -575,11 +575,11 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level,
     return NO_ERROR;
   } else if (query_token == QUERY_KEY_USAGE_SUPPORT) {
     bool supports_usage_reporting;
-    const bool got_info = crypto_session->UsageInformationSupport(
+    const bool got_info = crypto_session->HasUsageInfoSupport(
         security_level, &supports_usage_reporting);
 
     if (!got_info) {
-      LOGW("UsageInformationSupport failed");
+      LOGW("HasUsageInfoSupport failed");
       metrics_->GetCryptoMetrics()
           ->crypto_session_usage_information_support_.SetError(got_info);
       return UNKNOWN_ERROR;
@@ -1414,7 +1414,7 @@ CdmResponseType CdmEngine::RemoveAllUsageInfo(
     usage_session_.reset(new CdmSession(file_system_, metrics_->AddSession()));
     usage_session_->Init(usage_property_set_.get());
 
-    if (usage_session_->get_usage_support_type() == kUsageEntrySupport) {
+    if (usage_session_->supports_usage_info()) {
       std::vector<DeviceFiles::CdmUsageData> usage_data;
       // Retrieve all usage information but delete only one before
       // refetching. This is because deleting the usage entry
@@ -1505,7 +1505,7 @@ CdmResponseType CdmEngine::RemoveUsageInfo(
         continue;
       }
 
-      if (usage_session_->get_usage_support_type() == kUsageEntrySupport) {
+      if (usage_session_->supports_usage_info()) {
         status = usage_session_->DeleteUsageEntry(usage_entry_number);
         if (!handle.DeleteUsageInfo(DeviceFiles::GetUsageInfoFileName(app_id),
                                     provider_session_token)) {
@@ -1910,7 +1910,7 @@ void CdmEngine::OnTimerEvent() {
       for (CdmSessionList::iterator iter = sessions.begin();
            iter != sessions.end(); ++iter) {
         (*iter)->reset_usage_flags();
-        if ((*iter)->get_usage_support_type() == kUsageEntrySupport &&
+        if ((*iter)->supports_usage_info() &&
             (*iter)->has_provider_session_token()) {
           (*iter)->UpdateUsageEntryInformation();
         }