Add |legacy_destination_url| back to SessionMessage for EME

content/renderer/media/crypto/proxy_media_keys.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 "content/renderer/media/crypto/proxy_media_keys.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 143 matching lines @@
   scoped_ptr<media::CdmPromise> promise = TakePromise(session_id);
   if (promise) {
     media::NewSessionCdmPromise* session_promise(
         static_cast<media::NewSessionCdmPromise*>(promise.get()));
     session_promise->resolve(web_session_id);
   }
 }
 
 void ProxyMediaKeys::OnSessionMessage(uint32 session_id,
                                       const std::vector<uint8>& message,
                                       const GURL& destination_url) {

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

legacy?

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

Done.

   // TODO(jrummell): Once |message_type| is passed, use it rather than
   // guessing from the URL.
   media::MediaKeys::MessageType message_type =
       destination_url.is_empty() ? media::MediaKeys::LICENSE_REQUEST
                                  : media::MediaKeys::LICENSE_RENEWAL;
-  session_message_cb_.Run(LookupWebSessionId(session_id), message_type,
-                          message);
+  session_message_cb_.Run(LookupWebSessionId(session_id), message_type, message,
+                          destination_url);

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

legacy?

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

Done.

 }
 
 void ProxyMediaKeys::OnSessionReady(uint32 session_id) {
   scoped_ptr<media::CdmPromise> promise = TakePromise(session_id);
   if (promise) {
     media::SimpleCdmPromise* simple_promise(
         static_cast<media::SimpleCdmPromise*>(promise.get()));
     simple_promise->resolve();
   }
 }
@@ skipping 105 matching lines @@
 
 scoped_ptr<media::CdmPromise> ProxyMediaKeys::TakePromise(uint32_t session_id) {
   PromiseMap::iterator it = session_id_to_promise_map_.find(session_id);
   // May not be a promise associated with this session for asynchronous events.
   if (it == session_id_to_promise_map_.end())
     return scoped_ptr<media::CdmPromise>();
   return session_id_to_promise_map_.take_and_erase(it);
 }
 
 }  // namespace content