EME: Remove obsolete legacy APIs related to versions of prefixed EME

content/browser/media/cdm/browser_cdm_manager.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/browser/media/cdm/browser_cdm_manager.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
@@ skipping 291 matching lines @@
 #endif
   }
 
   return cdm_factory_.get();
 }
 
 void BrowserCdmManager::OnSessionMessage(int render_frame_id,
                                          int cdm_id,
                                          const std::string& session_id,
                                          MediaKeys::MessageType message_type,
-                                         const std::vector<uint8_t>& message,
-                                         const GURL& legacy_destination_url) {
-  GURL verified_gurl = legacy_destination_url;
-  if (!verified_gurl.is_valid() && !verified_gurl.is_empty()) {
-    DLOG(WARNING) << "SessionMessage legacy_destination_url is invalid : "
-                  << legacy_destination_url.possibly_invalid_spec();
-    verified_gurl =
-        GURL::EmptyGURL();  // Replace invalid legacy_destination_url.
-  }
-
+                                         const std::vector<uint8_t>& message) {
   Send(new CdmMsg_SessionMessage(render_frame_id, cdm_id, session_id,
-                                 message_type, message, verified_gurl));
+                                 message_type, message));
 }
 
 void BrowserCdmManager::OnSessionClosed(int render_frame_id,
                                         int cdm_id,
                                         const std::string& session_id) {
   Send(new CdmMsg_SessionClosed(render_frame_id, cdm_id, session_id));
 }
 
-void BrowserCdmManager::OnLegacySessionError(
-    int render_frame_id,
-    int cdm_id,
-    const std::string& session_id,
-    MediaKeys::Exception exception_code,
-    uint32_t system_code,
-    const std::string& error_message) {
-  Send(new CdmMsg_LegacySessionError(render_frame_id, cdm_id, session_id,
-                                     exception_code, system_code,
-                                     error_message));
-}
-
 void BrowserCdmManager::OnSessionKeysChange(int render_frame_id,
                                             int cdm_id,
                                             const std::string& session_id,
                                             bool has_additional_usable_key,
                                             media::CdmKeysInfo keys_info) {
   std::vector<media::CdmKeyInformation> key_info_vector;
   for (auto* key_info : keys_info)
     key_info_vector.push_back(*key_info);
   Send(new CdmMsg_SessionKeysChange(render_frame_id, cdm_id, session_id,
                                     has_additional_usable_key,
@@ skipping 43 matching lines @@
   // |allow_persistent_state| from the render process.
   media::CdmConfig cdm_config;
   cdm_config.allow_distinctive_identifier = true;
   cdm_config.allow_persistent_state = true;
   cdm_config.use_hw_secure_codecs = params.use_hw_secure_codecs;
 
   GetCdmFactory()->Create(
       params.key_system, params.security_origin, cdm_config,
       BROWSER_CDM_MANAGER_CB(OnSessionMessage),
       BROWSER_CDM_MANAGER_CB(OnSessionClosed),
-      BROWSER_CDM_MANAGER_CB(OnLegacySessionError),
       BROWSER_CDM_MANAGER_CB(OnSessionKeysChange),
       BROWSER_CDM_MANAGER_CB(OnSessionExpirationUpdate),
       BROWSER_CDM_MANAGER_CB(OnCdmCreated, params.security_origin,
                              base::Passed(&promise)));
 }
 
 void BrowserCdmManager::OnSetServerCertificate(
     int render_frame_id,
     int cdm_id,
     uint32_t promise_id,
@@ skipping 311 matching lines @@
   scoped_refptr<MediaKeys> cdm = GetCdm(render_frame_id, cdm_id);
   if (!cdm) {
     promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
     return;
   }
 
   cdm->LoadSession(session_type, session_id, std::move(promise));
 }
 
 }  // namespace content