Revert "Merge latest oemcrypto-v17 change"

This reverts commit 642965c678.

Reason for revert: Droidfood Blocking Bug: 217145027

Change-Id: I669b72fcd91c62e28883b5f55eb36af274d85806
(cherry picked from commit 8dbea15e5da05b371572297041454569dc166c90)
Merged-In:I669b72fcd91c62e28883b5f55eb36af274d85806

libwvdrmengine/cdm/core/include/device_files.h

@@ -20,12 +20,10 @@
 #  include <gtest/gtest_prod.h>
 #endif
 
-namespace wvutil {
-class FileSystem;
-}
-
 namespace wvcdm {
 
+class FileSystem;
+
 class DeviceFiles {
  public:
   typedef enum {
@@ -113,7 +111,7 @@ class DeviceFiles {
     CryptoWrappedKey wrapped_private_key;
   };
 
-  DeviceFiles(wvutil::FileSystem*);
+  DeviceFiles(FileSystem*);
   virtual ~DeviceFiles();
 
   virtual bool Init(CdmSecurityLevel security_level);
@@ -130,7 +128,6 @@ class DeviceFiles {
                                                CryptoWrappedKey* private_key,
                                                std::string* serial_number,
                                                uint32_t* system_id);
-  // Returns true if a DRM certificate is available.
   virtual bool HasCertificate(bool atsc_mode_enabled);
   // Retrieves the legacy DRM certificate without performing expiry
   // related validation. Use this only when restoring/releasing
@@ -141,13 +138,6 @@ class DeviceFiles {
                                          uint32_t* system_id);
   virtual bool RemoveCertificate();
 
-  virtual bool StoreOemCertificate(const std::string& certificate,
-                                   const CryptoWrappedKey& private_key);
-  virtual DeviceFiles::CertificateState RetrieveOemCertificate(
-      std::string* certificate, CryptoWrappedKey* wrapped_private_key);
-  virtual bool HasOemCertificate();
-  virtual bool RemoveOemCertificate();
-
   virtual bool StoreLicense(const CdmLicenseData& license_data,
                             ResponseType* result);
 
@@ -298,7 +288,7 @@ class DeviceFiles {
   bool HasCertificate(CertificateType certificate_type);
 
   // Helpers that wrap the File interface and automatically handle hashing, as
-  // well as adding the device files base path to the file name.
+  // well as adding the device files base path to to the file name.
   ResponseType StoreFileWithHash(const std::string& name,
                                  const std::string& serialized_file);
   ResponseType StoreFileRaw(const std::string& name,
@@ -312,8 +302,6 @@ class DeviceFiles {
 
   static bool GetCertificateFileName(CertificateType certificate_type,
                                      std::string* certificate_file_name);
-  static bool GetOemCertificateFileName(std::string* certificate_file_name);
-
   static std::string GetHlsAttributesFileNameExtension();
   static std::string GetLicenseFileNameExtension();
   static std::string GetUsageTableFileName();
@@ -370,7 +358,7 @@ class DeviceFiles {
 
   static std::set<std::string> reserved_license_ids_;
 
-  wvutil::FileSystem* file_system_;
+  FileSystem* file_system_;
   CdmSecurityLevel security_level_;
   bool initialized_;