Merge "Consolidate proto parsing into DeviceFiles::RetrieveHashedFile"

2016-01-19 22:58:06 +00:00
parent 8ceea06476 02751bcc91
commit f07494fce9
3 changed files with 36 additions and 66 deletions
--- a/libwvdrmengine/cdm/core/include/device_files.h
+++ b/libwvdrmengine/cdm/core/include/device_files.h
@@ -8,6 +8,7 @@
 #include <set>
 #include <string>

+#include "device_files.pb.h"
 #include "scoped_ptr.h"
 #include "wv_cdm_types.h"

@@ -107,7 +108,7 @@ class DeviceFiles {
  bool StoreFileRaw(const std::string& name,
                    const std::string& serialized_file);
  bool RetrieveHashedFile(const std::string& name,
-                          std::string* serialized_file);
+                          video_widevine_client::sdk::File* file);
  bool FileExists(const std::string& name);
  bool RemoveFile(const std::string& name);
  ssize_t GetFileSize(const std::string& name);