Add |legacy_destination_url| back to SessionMessage for EME

media/blink/cdm_session_adapter.cc

 // Copyright 2014 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/blink/cdm_session_adapter.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
@@ skipping 101 matching lines @@
 CdmContext* CdmSessionAdapter::GetCdmContext() {
   return media_keys_->GetCdmContext();
 }
 
 const std::string& CdmSessionAdapter::GetKeySystemUMAPrefix() const {
   return key_system_uma_prefix_;
 }
 
 void CdmSessionAdapter::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) {

[xhwang, 2015/01/13 18:45:13]

/* legacy_destination_url */ to be clear that the URL is dropped here.

[jrummell, 2015/01/13 19:46:31]

Done.

   WebContentDecryptionModuleSessionImpl* session = GetSession(web_session_id);
   DLOG_IF(WARNING, !session) << __FUNCTION__ << " for unknown session "
                              << web_session_id;
   if (session)
     session->OnSessionMessage(message_type, message);
 }
 
 void CdmSessionAdapter::OnSessionKeysChange(const std::string& web_session_id,
                                             bool has_additional_usable_key,
                                             CdmKeysInfo keys_info) {
@@ skipping 35 matching lines @@
 WebContentDecryptionModuleSessionImpl* CdmSessionAdapter::GetSession(
     const std::string& web_session_id) {
   // Since session objects may get garbage collected, it is possible that there
   // are events coming back from the CDM and the session has been unregistered.
   // We can not tell if the CDM is firing events at sessions that never existed.
   SessionMap::iterator session = sessions_.find(web_session_id);
   return (session != sessions_.end()) ? session->second.get() : NULL;
 }
 
 }  // namespace media