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

media/cdm/cdm_adapter_unittest.cc

 // Copyright 2015 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/cdm/cdm_adapter.h"
 
 #include <stdint.h>
 #include <memory>
 
 #include "base/bind.h"
@@ skipping 72 matching lines @@
   // or generates an error.
   void InitializeAndExpect(base::FilePath library_path,
                            ExpectedResult expected_result) {
     CdmConfig cdm_config;  // default settings of false are sufficient.
     std::unique_ptr<CdmAllocator> allocator(new SimpleCdmAllocator());
     CdmAdapter::Create(
         helper_.KeySystemName(), library_path, cdm_config, std::move(allocator),
         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,
                    base::Unretained(this)),
         base::Bind(&CdmAdapterTest::OnCdmCreated, base::Unretained(this),
                    expected_result));
     RunUntilIdle();
   }
 
   // Creates a new session using |key_id|. |session_id_| will be set
   // when the promise is resolved. |expected_result| tests that
   // CreateSessionAndGenerateRequest() succeeds or generates an error.
   void CreateSessionAndExpect(EmeInitDataType data_type,
                               const std::vector<uint8_t>& key_id,
                               ExpectedResult expected_result) {
     DCHECK(!key_id.empty());
 
     if (expected_result == SUCCESS) {
-      EXPECT_CALL(*this,
-                  OnSessionMessage(IsNotEmpty(), _, _, GURL::EmptyGURL()));
+      EXPECT_CALL(*this, OnSessionMessage(IsNotEmpty(), _, _));
     }
 
     adapter_->CreateSessionAndGenerateRequest(
         MediaKeys::TEMPORARY_SESSION, data_type, key_id,
         CreateSessionPromise(expected_result));
     RunUntilIdle();
   }
 
   // Loads the session specified by |session_id|. |expected_result| tests
   // that LoadSession() succeeds or generates an error.
@@ skipping 89 matching lines @@
 
   // Methods used for promise resolved/rejected.
   MOCK_METHOD0(OnResolve, void());
   MOCK_METHOD1(OnResolveWithSession, void(const std::string& session_id));
   MOCK_METHOD3(OnReject,
                void(MediaKeys::Exception exception_code,
                     uint32_t system_code,
                     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));
   void OnSessionKeysChange(const std::string& session_id,
                            bool has_additional_usable_key,
                            CdmKeysInfo keys_info) {
     // MOCK methods don't like CdmKeysInfo.
     OnSessionKeysChangeCalled(session_id, has_additional_usable_key);
   }
   MOCK_METHOD2(OnSessionExpirationUpdate,
@@ skipping 79 matching lines @@
 TEST_F(CdmAdapterTest, UpdateSessionWithBadData) {
   InitializeAndExpect(ExternalClearKeyLibrary(), SUCCESS);
 
   std::vector<uint8_t> key_id(kKeyId, kKeyId + arraysize(kKeyId));
   CreateSessionAndExpect(EmeInitDataType::WEBM, key_id, SUCCESS);
 
   UpdateSessionAndExpect(SessionId(), "random data", FAILURE, true);
 }
 
 }  // namespace media