Source release 19.5.0

cdm/include/read_client_info.h

@@ -6,7 +6,9 @@
 
 #include <string>
 
-namespace widevine {
+#include "cdm_version.h"
+
+namespace CDM_NAMESPACE {
 
 // This function must be implemented by partners who wish to use run-time client
 // information. (i.e. Those that set 'client_info_source' to 'runtime' in their
@@ -27,6 +29,6 @@ bool ReadClientInformation(std::string* company_name, std::string* model_name,
                            std::string* platform, std::string* form_factor,
                            std::string* version);
 
-}  // namespace widevine
+}  // namespace CDM_NAMESPACE
 
 #endif  // WVCDM_CDM_READ_CLIENT_INFO_H_