resolved conflicts for merge of ab95cf27 to master

Change-Id: I194f2a00507a8469b3f15bd2d629d41dc07c1b45
2014-03-28 16:30:31 -07:00
parent 5e0b7328e7 ab95cf27f1
commit f23c54d834
16 changed files with 317 additions and 107 deletions
--- a/libwvdrmengine/cdm/include/wv_content_decryption_module.h
+++ b/libwvdrmengine/cdm/include/wv_content_decryption_module.h
@@ -30,6 +30,7 @@ class WvContentDecryptionModule : public TimerHandler {
  // Construct a valid license request.
  virtual CdmResponseType GenerateKeyRequest(const CdmSessionId& session_id,
                                             const CdmKeySetId& key_set_id,
+                                             const std::string& mime_type,
                                             const CdmInitData& init_data,
                                             const CdmLicenseType license_type,
                                             CdmAppParameterMap& app_parameters,