Source release v2.2.0-0-903 + third_party libs

Change-Id: I03f670eaeb052bc741abb347be06f8ddc58418e7

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*>
@@ -93,6 +97,7 @@ class Properties {
   FRIEND_TEST(CdmSessionTest, ReInitFail);
   FRIEND_TEST(CdmSessionTest, InitFailCryptoError);
   FRIEND_TEST(CdmSessionTest, InitNeedsProvisioning);
+  FRIEND_TEST(CdmLicenseTest, PrepareKeyRequestValidation);
 #endif
 
  private: