| Index: media/test/pipeline_integration_test.cc
|
| diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
|
| index 2a0e72a9bb72857cfd58fd310139a1df15e04fee..28e4c4e546e0765759391395060f069334c97bdd 100644
|
| --- a/media/test/pipeline_integration_test.cc
|
| +++ b/media/test/pipeline_integration_test.cc
|
| @@ -208,7 +208,6 @@ class FakeEncryptedMedia {
|
| virtual void OnSessionMessage(const std::string& session_id,
|
| MediaKeys::MessageType message_type,
|
| const std::vector<uint8_t>& message,
|
| - const GURL& legacy_destination_url,
|
| AesDecryptor* decryptor) = 0;
|
|
|
| virtual void OnSessionClosed(const std::string& session_id) = 0;
|
| @@ -217,14 +216,6 @@ class FakeEncryptedMedia {
|
| bool has_additional_usable_key,
|
| CdmKeysInfo keys_info) = 0;
|
|
|
| - // Errors are not expected unless overridden.
|
| - virtual void OnLegacySessionError(const std::string& session_id,
|
| - const std::string& error_name,
|
| - uint32_t system_code,
|
| - const std::string& error_message) {
|
| - FAIL() << "Unexpected Key Error";
|
| - }
|
| -
|
| virtual void OnEncryptedMediaInitData(EmeInitDataType init_data_type,
|
| const std::vector<uint8_t>& init_data,
|
| AesDecryptor* decryptor) = 0;
|
| @@ -247,10 +238,8 @@ class FakeEncryptedMedia {
|
| // Callbacks for firing session events. Delegate to |app_|.
|
| void OnSessionMessage(const std::string& session_id,
|
| MediaKeys::MessageType message_type,
|
| - const std::vector<uint8_t>& message,
|
| - const GURL& legacy_destination_url) {
|
| - app_->OnSessionMessage(session_id, message_type, message,
|
| - legacy_destination_url, decryptor_.get());
|
| + const std::vector<uint8_t>& message) {
|
| + app_->OnSessionMessage(session_id, message_type, message, decryptor_.get());
|
| }
|
|
|
| void OnSessionClosed(const std::string& session_id) {
|
| @@ -264,14 +253,6 @@ class FakeEncryptedMedia {
|
| std::move(keys_info));
|
| }
|
|
|
| - void OnLegacySessionError(const std::string& session_id,
|
| - const std::string& error_name,
|
| - uint32_t system_code,
|
| - const std::string& error_message) {
|
| - app_->OnLegacySessionError(session_id, error_name, system_code,
|
| - error_message);
|
| - }
|
| -
|
| void OnEncryptedMediaInitData(EmeInitDataType init_data_type,
|
| const std::vector<uint8_t>& init_data) {
|
| app_->OnEncryptedMediaInitData(init_data_type, init_data, decryptor_.get());
|
| @@ -341,7 +322,6 @@ class KeyProvidingApp : public FakeEncryptedMedia::AppBase {
|
| void OnSessionMessage(const std::string& session_id,
|
| MediaKeys::MessageType message_type,
|
| const std::vector<uint8_t>& message,
|
| - const GURL& legacy_destination_url,
|
| AesDecryptor* decryptor) override {
|
| EXPECT_FALSE(session_id.empty());
|
| EXPECT_FALSE(message.empty());
|
| @@ -463,7 +443,6 @@ class NoResponseApp : public FakeEncryptedMedia::AppBase {
|
| void OnSessionMessage(const std::string& session_id,
|
| MediaKeys::MessageType message_type,
|
| const std::vector<uint8_t>& message,
|
| - const GURL& legacy_destination_url,
|
| AesDecryptor* decryptor) override {
|
| EXPECT_FALSE(session_id.empty());
|
| EXPECT_FALSE(message.empty());
|
|
|