diff --git a/libwvdrmengine/cdm/core/include/usage_table_header.h b/libwvdrmengine/cdm/core/include/usage_table_header.h
index df8750e9..66aef9b3 100644
--- a/libwvdrmengine/cdm/core/include/usage_table_header.h
+++ b/libwvdrmengine/cdm/core/include/usage_table_header.h
@@ -239,7 +239,7 @@ class UsageTableHeader {
 
   // Stores the usage table and it's info.  This will increment
   // |store_table_counter_| if successful.
-  bool StoreTable(DeviceFiles* device_files);
+  bool StoreTable();
 
   CdmResponseType Shrink(metrics::CryptoMetrics* metrics,
                          uint32_t number_of_usage_entries_to_delete);
diff --git a/libwvdrmengine/cdm/core/src/usage_table_header.cpp b/libwvdrmengine/cdm/core/src/usage_table_header.cpp
index 1975345e..f0cc7969 100644
--- a/libwvdrmengine/cdm/core/src/usage_table_header.cpp
+++ b/libwvdrmengine/cdm/core/src/usage_table_header.cpp
@@ -241,7 +241,7 @@ bool UsageTableHeader::CreateNewTable(CryptoSession* const crypto_session) {
     LOGE("Failed to create new usage table header");
     return false;
   }
-  if (!StoreTable(device_files_.get())) {
+  if (!StoreTable()) {
     LOGE("Failed to store new usage table header");
     return false;
   }
@@ -299,7 +299,7 @@ CdmResponseType UsageTableHeader::AddEntry(
     usage_entry_info_[*usage_entry_number].Clear();
     return status;
   }
-  StoreTable(device_files_.get());
+  StoreTable();
   return NO_ERROR;
 }
 
@@ -348,7 +348,7 @@ CdmResponseType UsageTableHeader::UpdateEntry(uint32_t usage_entry_number,
   if (status != NO_ERROR) return status;
   usage_entry_info_[usage_entry_number].last_use_time = GetCurrentTime();
 
-  StoreTable(device_files_.get());
+  StoreTable();
   return NO_ERROR;
 }
 
@@ -391,14 +391,14 @@ CdmResponseType UsageTableHeader::InvalidateEntryInternal(
       // changes to the table, and as a result, it will not store the
       // invalidated entry.
       LOGD("Table was not stored during defrag, storing now");
-      StoreTable(device_files);
+      StoreTable();
     }
     if (status == SYSTEM_INVALIDATED_ERROR) {
       LOGE("Invalidate entry failed due to system invalidation error");
       return SYSTEM_INVALIDATED_ERROR;
     }
   } else {
-    StoreTable(device_files);
+    StoreTable();
   }
 
   return NO_ERROR;
@@ -717,7 +717,7 @@ CdmResponseType UsageTableHeader::MoveEntry(
   }
 
   // Store the usage table and usage entry after successful move.
-  StoreTable(device_files);
+  StoreTable();
   StoreEntry(to_usage_entry_number, device_files, usage_entry);
 
   return NO_ERROR;
@@ -857,10 +857,10 @@ CdmResponseType UsageTableHeader::StoreEntry(uint32_t usage_entry_number,
   return NO_ERROR;
 }
 
-bool UsageTableHeader::StoreTable(DeviceFiles* device_files) {
+bool UsageTableHeader::StoreTable() {
   LOGV("Storing usage table information");
-  const bool result =
-      device_files->StoreUsageTableInfo(usage_table_header_, usage_entry_info_);
+  const bool result = device_files_->StoreUsageTableInfo(usage_table_header_,
+                                                         usage_entry_info_);
   if (result) {
     ++store_table_counter_;
   } else {
@@ -906,7 +906,7 @@ CdmResponseType UsageTableHeader::Shrink(
 
   if (status == NO_ERROR) {
     usage_entry_info_.resize(new_size);
-    StoreTable(device_files_.get());
+    StoreTable();
   }
   return status;
 }
@@ -1128,7 +1128,7 @@ CdmResponseType UsageTableHeader::DefragTable(DeviceFiles* device_files,
   // this case, nothing more to do.
   if (to_remove == 0) {
     LOGD("Defrag completed without shrinking table");
-    StoreTable(device_files);
+    StoreTable();
     return NO_ERROR;
   }