resolved conflicts for merge of 7eea20df to master

Change-Id: Ibd8b16745d36b24041856f315fbb09a6c25cf4fb

libwvdrmengine/cdm/core/include/cdm_engine.h

@@ -4,6 +4,7 @@
 #define CDM_BASE_CDM_ENGINE_H_
 
 #include "certificate_provisioning.h"
+#include "initialization_data.h"
 #include "oemcrypto_adapter.h"
 #include "wv_cdm_types.h"
 
@@ -35,8 +36,7 @@ class CdmEngine {
   // Construct a valid license request
   CdmResponseType GenerateKeyRequest(const CdmSessionId& session_id,
                                      const CdmKeySetId& key_set_id,
-                                     const std::string& mime_type,
-                                     const CdmInitData& init_data,
+                                     const InitializationData& init_data,
                                      const CdmLicenseType license_type,
                                      CdmAppParameterMap& app_parameters,
                                      CdmKeyMessage* key_request,
@@ -110,11 +110,6 @@ class CdmEngine {
   bool DetachEventListener(const CdmSessionId& session_id,
                            WvCdmEventListener* listener);
 
-  // Parse a blob of multiple concatenated PSSH atoms to extract the first
-  // widevine pssh
-  static bool ExtractWidevinePssh(const CdmInitData& init_data,
-                                  CdmInitData* output);
-
   // Timer expiration method
   void OnTimerEvent();