Add |legacy_destination_url| back to SessionMessage for EME

media/cdm/proxy_decryptor.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cdm/proxy_decryptor.h"
 
 #include <cstring>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 193 matching lines @@
       security_origin,
       base::Bind(&ProxyDecryptor::OnSessionMessage, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionClosed, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionError, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionKeysChange, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionExpirationUpdate, weak_this));
 }
 
 void ProxyDecryptor::OnSessionMessage(const std::string& web_session_id,
                                       MediaKeys::MessageType message_type,
-                                      const std::vector<uint8>& message) {
+                                      const std::vector<uint8>& message,
+                                      const GURL& legacy_destination_url) {
   // Assumes that OnSessionCreated() has been called before this.
 
-  // EME v0.1b gets passed |destination_url| rather than |message_type|.
-  // Since we have no idea what the URL should be, return an empty one in all
-  // cases.
-
   // For ClearKey, convert the message from JSON into just passing the key
   // as the message. If unable to extract the key, return the message unchanged.
   if (is_clear_key_) {
     std::vector<uint8> key;
     if (ExtractFirstKeyIdFromLicenseRequest(message, &key)) {
-      key_message_cb_.Run(web_session_id, key, GURL());
+      key_message_cb_.Run(web_session_id, key, legacy_destination_url);
       return;
     }
   }
 
-  key_message_cb_.Run(web_session_id, message, GURL());
+  key_message_cb_.Run(web_session_id, message, legacy_destination_url);
 }
 
 void ProxyDecryptor::OnSessionKeysChange(const std::string& web_session_id,
                                          bool has_additional_usable_key,
                                          CdmKeysInfo keys_info) {
   // EME v0.1b doesn't support this event.
 }
 
 void ProxyDecryptor::OnSessionExpirationUpdate(
     const std::string& web_session_id,
@@ skipping 60 matching lines @@
   bool is_persistent =
       session_type == PersistentSession || session_type == LoadSession;
   active_sessions_.insert(std::make_pair(web_session_id, is_persistent));
 
   // For LoadSession(), generate the KeyAdded event.
   if (session_type == LoadSession)
     GenerateKeyAdded(web_session_id);
 }
 
 }  // namespace media