Source release 14.1.0

core/include/device_files.h

@@ -1,4 +1,6 @@
-// Copyright 2013 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 //
 #ifndef WVCDM_CORE_DEVICE_FILES_H_
 #define WVCDM_CORE_DEVICE_FILES_H_
@@ -10,6 +12,7 @@
 #include <vector>
 
 #include "device_files.pb.h"
+#include "disallow_copy_and_assign.h"
 #include "scoped_ptr.h"
 #include "wv_cdm_types.h"
 
@@ -105,9 +108,13 @@ class DeviceFiles {
                               const CdmUsageEntry& usage_entry,
                               uint32_t usage_entry_number);
 
-  // Extract KSIDs from usage information on the file system.
-  virtual bool ListUsageRecords(const std::string& app_id,
-                                std::vector<std::string>* ksids);
+  // Retrieve usage identifying information stored on the file system.
+  // The caller needs to specify at least one of |ksids| or
+  // |provider_session_tokens|
+  virtual bool ListUsageIds(
+      const std::string& app_id,
+      std::vector<std::string>* ksids,
+      std::vector<std::string>* provider_session_tokens);
 
   // Get the provider session token for the given key_set_id.
   virtual bool GetProviderSessionToken(const std::string& app_id,