resolved conflicts for merge of 66cadaa9 to master

Change-Id: I2a052d56516f0e246d77148a38191430ff139c3e
2014-03-29 12:33:46 -07:00
parent f23c54d834 66cadaa9fa
commit 55f1de2fe5
16 changed files with 107 additions and 315 deletions
--- a/libwvdrmengine/cdm/include/wv_content_decryption_module.h
+++ b/libwvdrmengine/cdm/include/wv_content_decryption_module.h
@@ -30,7 +30,6 @@ 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,