Merge "Merge Widevine CDM-Side Core Changes"

libwvdrmengine/cdm/Android.mk

@@ -31,7 +31,7 @@ LOCAL_SRC_FILES := \
     $(CORE_SRC_DIR)/max_res_engine.cpp \
     $(CORE_SRC_DIR)/oemcrypto_adapter_dynamic.cpp \
     $(CORE_SRC_DIR)/policy_engine.cpp \
-    $(CORE_SRC_DIR)/privacy_crypto.cpp \
+    $(CORE_SRC_DIR)/privacy_crypto_openssl.cpp \
     $(SRC_DIR)/wv_content_decryption_module.cpp
 
 LOCAL_MODULE := libcdm

libwvdrmengine/cdm/core/include/cdm_engine.h

@@ -5,7 +5,6 @@
 
 #include <string>
 
-#include "cdm_session.h"
 #include "certificate_provisioning.h"
 #include "crypto_session.h"
 #include "initialization_data.h"
@@ -17,6 +16,7 @@
 namespace wvcdm {
 
 class CdmClientPropertySet;
+class CdmSession;
 class CryptoEngine;
 class UsagePropertySet;
 class WvCdmEventListener;

libwvdrmengine/cdm/core/include/privacy_crypto.h

@@ -55,7 +55,7 @@ class RsaPublicKey {
   bool Encrypt(const std::string& plaintext,
                std::string* ciphertext);
 
-  // Verify RSSASSA-PSS signature. Caller retains ownership of all parameters.
+  // Verify RSASSA-PSS signature. Caller retains ownership of all parameters.
   // Returns true if validation succeeds, false otherwise.
   bool VerifySignature(const std::string& message,
                        const std::string& signature);

libwvdrmengine/cdm/core/include/properties.h

@@ -11,6 +11,10 @@
 #include "scoped_ptr.h"
 #include "wv_cdm_types.h"
 
+#if defined(UNIT_TEST)
+# include "gtest/gtest_prod.h"
+#endif
+
 namespace wvcdm {
 
 typedef std::map<CdmSessionId, const CdmClientPropertySet*>