Add |legacy_destination_url| back to SessionMessage for EME

media/mojo/services/mojo_cdm.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/mojo/services/mojo_cdm.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "media/base/cdm_key_information.h"
 #include "media/base/cdm_promise.h"
@@ skipping 104 matching lines @@
                                                     base::Passed(&promise)));
 }
 
 CdmContext* MojoCdm::GetCdmContext() {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 void MojoCdm::OnSessionMessage(const mojo::String& session_id,
                                mojo::CdmMessageType message_type,
-                               mojo::Array<uint8_t> message) {
+                               mojo::Array<uint8_t> message,
+                               const mojo::String& legacy_destination_url) {
+  GURL verified_gurl = GURL(legacy_destination_url);
+  if (!verified_gurl.is_valid() && !verified_gurl.is_empty()) {
+    DLOG(WARNING) << "SessionMessage destination_url is invalid : "
+                  << verified_gurl.possibly_invalid_spec();
+    verified_gurl = GURL::EmptyGURL();  // Replace invalid destination_url.
+  }
+
   session_message_cb_.Run(session_id,
                           static_cast<MediaKeys::MessageType>(message_type),
-                          message.storage());
+                          message.storage(), verified_gurl);
 }
 
 void MojoCdm::OnSessionClosed(const mojo::String& session_id) {
   session_closed_cb_.Run(session_id);
 }
 
 void MojoCdm::OnSessionError(const mojo::String& session_id,
                              mojo::CdmException exception,
                              uint32_t system_code,
                              const mojo::String& error_message) {
@@ skipping 26 matching lines @@
 void MojoCdm::OnPromiseResult(scoped_ptr<CdmPromiseTemplate<T...>> promise,
                               mojo::CdmPromiseResultPtr result,
                               typename MojoTypeTrait<T>::MojoType... args) {
   if (result->success)
     promise->resolve(args.template To<T>()...);  // See ISO C++03 14.2/4.
   else
     RejectPromise(promise.Pass(), result.Pass());
 }
 
 }  // namespace media