Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Unified Diff: media/cdm/cdm_adapter_unittest.cc

Issue 2255943002: EME: Remove obsolete legacy APIs related to versions of prefixed EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build and add bug reference for obsoletes Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/cdm/cdm_adapter_unittest.cc
diff --git a/media/cdm/cdm_adapter_unittest.cc b/media/cdm/cdm_adapter_unittest.cc
index bbeb50329cba733e5ea16cad80abb4d83e28c87f..1f64f4f9c5929ad547e785c97e4102da02e5ab93 100644
--- a/media/cdm/cdm_adapter_unittest.cc
+++ b/media/cdm/cdm_adapter_unittest.cc
@@ -90,8 +90,6 @@ class CdmAdapterTest : public testing::Test {
base::Bind(&CdmAdapterTest::CreateCdmFileIO, base::Unretained(this)),
base::Bind(&CdmAdapterTest::OnSessionMessage, base::Unretained(this)),
base::Bind(&CdmAdapterTest::OnSessionClosed, base::Unretained(this)),
- base::Bind(&CdmAdapterTest::OnLegacySessionError,
- base::Unretained(this)),
base::Bind(&CdmAdapterTest::OnSessionKeysChange,
base::Unretained(this)),
base::Bind(&CdmAdapterTest::OnSessionExpirationUpdate,
@@ -110,8 +108,7 @@ class CdmAdapterTest : public testing::Test {
DCHECK(!key_id.empty());
if (expected_result == SUCCESS) {
- EXPECT_CALL(*this,
- OnSessionMessage(IsNotEmpty(), _, _, GURL::EmptyGURL()));
+ EXPECT_CALL(*this, OnSessionMessage(IsNotEmpty(), _, _));
}
adapter_->CreateSessionAndGenerateRequest(
@@ -221,17 +218,11 @@ class CdmAdapterTest : public testing::Test {
const std::string& error_message));
// Methods used for the events possibly generated by CdmAdapater.
- MOCK_METHOD4(OnSessionMessage,
+ MOCK_METHOD3(OnSessionMessage,
void(const std::string& session_id,
MediaKeys::MessageType message_type,
- const std::vector<uint8_t>& message,
- const GURL& legacy_destination_url));
+ const std::vector<uint8_t>& message));
MOCK_METHOD1(OnSessionClosed, void(const std::string& session_id));
- MOCK_METHOD4(OnLegacySessionError,
- void(const std::string& session_id,
- MediaKeys::Exception exception,
- uint32_t system_code,
- const std::string& error_message));
MOCK_METHOD2(OnSessionKeysChangeCalled,
void(const std::string& session_id,
bool has_additional_usable_key));

Powered by Google App Engine
This is Rietveld 408576698