Source release 15.2.0

core/include/properties.h

@@ -20,8 +20,7 @@
 
 namespace wvcdm {
 
-typedef std::map<CdmSessionId, CdmClientPropertySet*>
-    CdmClientPropertySetMap;
+using CdmClientPropertySetMap = std::map<CdmSessionId, CdmClientPropertySet*>;
 
 // This class saves information about features and properties enabled
 // for a given platform. At initialization it initializes properties from
@@ -53,6 +52,9 @@ class Properties {
   static inline bool allow_service_certificate_requests() {
     return allow_service_certificate_requests_;
   }
+  static inline bool device_files_is_a_real_filesystem() {
+    return device_files_is_a_real_filesystem_;
+  }
   static void set_provisioning_messages_are_binary(bool flag) {
     provisioning_messages_are_binary_ = flag;
   }
@@ -63,11 +65,14 @@ class Properties {
   static bool GetProductName(std::string* product_name);
   static bool GetBuildInfo(std::string* build_info);
   static bool GetWVCdmVersion(std::string* version);
+  // Gets the base path for the device non-secure storage. Note that, depending
+  // on the value of device_files_is_a_real_filesystem, this may or may not be
+  // a real filesystem path.
   static bool GetDeviceFilesBasePath(CdmSecurityLevel security_level,
                                      std::string* base_path);
   static bool GetFactoryKeyboxPath(std::string* keybox);
   static bool GetOEMCryptoPath(std::string* library_name);
-  static bool GetSandboxId(std::string *sandbox_id);
+  static bool GetSandboxId(std::string* sandbox_id);
   static bool AlwaysUseKeySetIds();
   static bool UseProviderIdInProvisioningRequest();
 
@@ -137,6 +142,7 @@ class Properties {
   static bool use_certificates_as_identification_;
   static bool provisioning_messages_are_binary_;
   static bool allow_service_certificate_requests_;
+  static bool device_files_is_a_real_filesystem_;
   static std::unique_ptr<CdmClientPropertySetMap> session_property_set_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(Properties);