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

media/mojo/clients/mojo_cdm.h

 // 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.
 
 #ifndef MEDIA_MOJO_CLIENTS_MOJO_CDM_H_
 #define MEDIA_MOJO_CLIENTS_MOJO_CDM_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 26 matching lines @@
                 public CdmContext,
                 public mojom::ContentDecryptionModuleClient {
  public:
   static void Create(
       const std::string& key_system,
       const GURL& security_origin,
       const media::CdmConfig& cdm_config,
       mojom::ContentDecryptionModulePtr remote_cdm,
       const media::SessionMessageCB& session_message_cb,
       const media::SessionClosedCB& session_closed_cb,
-      const media::LegacySessionErrorCB& legacy_session_error_cb,
       const media::SessionKeysChangeCB& session_keys_change_cb,
       const media::SessionExpirationUpdateCB& session_expiration_update_cb,
       const media::CdmCreatedCB& cdm_created_cb);
 
   // MediaKeys implementation.
   void SetServerCertificate(const std::vector<uint8_t>& certificate,
                             std::unique_ptr<SimpleCdmPromise> promise) final;
   void CreateSessionAndGenerateRequest(
       SessionType session_type,
       EmeInitDataType init_data_type,
@@ skipping 13 matching lines @@
 
   // CdmContext implementation. Can be called on a different thread.
   // All GetDecryptor() calls must be made on the same thread.
   media::Decryptor* GetDecryptor() final;
   int GetCdmId() const final;
 
  private:
   MojoCdm(mojom::ContentDecryptionModulePtr remote_cdm,
           const SessionMessageCB& session_message_cb,
           const SessionClosedCB& session_closed_cb,
-          const LegacySessionErrorCB& legacy_session_error_cb,
           const SessionKeysChangeCB& session_keys_change_cb,
           const SessionExpirationUpdateCB& session_expiration_update_cb);
 
   ~MojoCdm() final;
 
   void InitializeCdm(const std::string& key_system,
                      const GURL& security_origin,
                      const media::CdmConfig& cdm_config,
                      std::unique_ptr<CdmInitializedPromise> promise);
 
   void OnConnectionError();
 
   // mojom::ContentDecryptionModuleClient implementation.
   void OnSessionMessage(const mojo::String& session_id,
                         mojom::CdmMessageType message_type,
-                        mojo::Array<uint8_t> message,
-                        const GURL& legacy_destination_url) final;
+                        mojo::Array<uint8_t> message) final;
   void OnSessionClosed(const mojo::String& session_id) final;
-  void OnLegacySessionError(const mojo::String& session_id,
-                            mojom::CdmException exception,
-                            uint32_t system_code,
-                            const mojo::String& error_message) final;
   void OnSessionKeysChange(
       const mojo::String& session_id,
       bool has_additional_usable_key,
       mojo::Array<mojom::CdmKeyInformationPtr> keys_info) final;
   void OnSessionExpirationUpdate(const mojo::String& session_id,
                                  double new_expiry_time_sec) final;
 
   // Callback for InitializeCdm.
   // Note: Cannot use OnPromiseResult() below since we need to handle connection
   // error. Also we have extra parameters |cdm_id| and |decryptor|, which aren't
@@ skipping 40 matching lines @@
 
   // Decryptor based on |decryptor_ptr_|, lazily created in GetDecryptor().
   // Since GetDecryptor() can be called on a different thread, use
   // |decryptor_task_runner_| to bind |decryptor_| to that thread.
   std::unique_ptr<MojoDecryptor> decryptor_;
   scoped_refptr<base::SingleThreadTaskRunner> decryptor_task_runner_;
 
   // Callbacks for firing session events.
   SessionMessageCB session_message_cb_;
   SessionClosedCB session_closed_cb_;
-  LegacySessionErrorCB legacy_session_error_cb_;
   SessionKeysChangeCB session_keys_change_cb_;
   SessionExpirationUpdateCB session_expiration_update_cb_;
 
   // Pending promise for InitializeCdm().
   std::unique_ptr<CdmInitializedPromise> pending_init_promise_;
 
   // This must be the last member.
   base::WeakPtrFactory<MojoCdm> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoCdm);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_CLIENTS_MOJO_CDM_H_