Add Support for WebM Back

Adds support for WebM to the CDM. Decryption remains untouched,
however the initialization data is passed differently for WebM.

The previous version of this change broke playback for certain
apps that were being allowed to pass invalid MIME types before
this change was made. This version maintains backwards-compatiblity
for these apps for now by rewriting their MIME types as "video/mp4".

Merge of https://widevine-internal-review.googlesource.com/9225/
and https://widevine-internal-review.googlesource.com/9611/ from
the Widevine cdm repo.

Bug: 10638562
Change-Id: Ib37e838d08363f07b34b3a2e79a3f80a1f43e9ad

libwvdrmengine/cdm/core/include/license.h

@@ -27,7 +27,8 @@ class CdmLicense {
   bool Init(const std::string& token, CryptoSession* session,
             PolicyEngine* policy_engine);
 
-  bool PrepareKeyRequest(const CdmInitData& pssh_data,
+  bool PrepareKeyRequest(const std::string& mime_type,
+                         const CdmInitData& init_data,
                          const CdmLicenseType license_type,
                          const CdmAppParameterMap& app_parameters,
                          const CdmSessionId& session_id,
@@ -42,7 +43,7 @@ class CdmLicense {
   bool RestoreOfflineLicense(CdmKeyMessage& license_request,
                              CdmKeyResponse& license_response,
                              CdmKeyResponse& license_renewal_response);
-  bool HasInitData() { return !init_data_.empty(); }
+  bool HasInitData() { return !stored_init_data_.empty(); }
   bool IsKeyLoaded(const KeyId& key_id);
 
  private:
@@ -54,12 +55,16 @@ class CdmLicense {
   CdmResponseType HandleKeyErrorResponse(
       const video_widevine_server::sdk::SignedMessage& signed_message);
 
+  template<typename T> bool PrepareContentId(const CdmLicenseType license_type,
+                                             const std::string& request_id,
+                                             T* content_id);
+
   CryptoSession* session_;
   PolicyEngine* policy_engine_;
   std::string server_url_;
   std::string token_;
   std::string service_certificate_;
-  std::string init_data_;
+  std::string stored_init_data_;
   bool initialized_;
   std::set<KeyId> loaded_keys_;