From 5d5da6c20263f14849b2356d89a6c1b9195655cf Mon Sep 17 00:00:00 2001 From: John Rummell Date: Thu, 31 Aug 2017 04:36:33 +0000 Subject: [PATCH] Remove |origin| from AesDecryptor's constructor As the origin is not used by AesDecryptor, remove it from the constructor to simplify things. BUG=478960 TEST=media_unittests pass Change-Id: I691f0b0ca19d00eb43d342d86ccfcd52f61ecb6a Reviewed-on: https://chromium-review.googlesource.com/644577 Reviewed-by: Xiaohan Wang Commit-Queue: John Rummell Cr-Commit-Position: refs/heads/master@{#498753} --- content/renderer/media/cdm/render_cdm_factory.cc | 4 ++-- media/base/android/android_cdm_factory.cc | 2 +- media/cdm/aes_decryptor.cc | 1 - media/cdm/aes_decryptor.h | 7 +------ media/cdm/aes_decryptor_unittest.cc | 4 +--- media/cdm/default_cdm_factory.cc | 2 +- media/cdm/ppapi/external_clear_key/clear_key_cdm.cc | 9 ++------- media/cdm/ppapi/external_clear_key/clear_key_cdm.h | 8 +------- .../clear_key_persistent_session_cdm.cc | 4 +--- .../clear_key_persistent_session_cdm.h | 5 ----- media/mojo/clients/mojo_cdm_factory.cc | 2 +- media/test/fake_encrypted_media.cc | 2 -- 12 files changed, 11 insertions(+), 39 deletions(-) diff --git a/content/renderer/media/cdm/render_cdm_factory.cc b/content/renderer/media/cdm/render_cdm_factory.cc index 6f17c04ecf52b3..249640c5cf3480 100644 --- a/content/renderer/media/cdm/render_cdm_factory.cc +++ b/content/renderer/media/cdm/render_cdm_factory.cc @@ -58,8 +58,8 @@ void RenderCdmFactory::Create( DCHECK(!cdm_config.allow_distinctive_identifier); DCHECK(!cdm_config.allow_persistent_state); scoped_refptr cdm(new media::AesDecryptor( - security_origin, session_message_cb, session_closed_cb, - session_keys_change_cb, session_expiration_update_cb)); + session_message_cb, session_closed_cb, session_keys_change_cb, + session_expiration_update_cb)); base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::BindOnce(cdm_created_cb, cdm, "")); return; diff --git a/media/base/android/android_cdm_factory.cc b/media/base/android/android_cdm_factory.cc index 1cd8030e5a2634..12c17cfef65ecb 100644 --- a/media/base/android/android_cdm_factory.cc +++ b/media/base/android/android_cdm_factory.cc @@ -66,7 +66,7 @@ void AndroidCdmFactory::Create( if (base::FeatureList::IsEnabled(media::kExternalClearKeyForTesting) && IsExternalClearKey(key_system)) { scoped_refptr cdm( - new AesDecryptor(security_origin, session_message_cb, session_closed_cb, + new AesDecryptor(session_message_cb, session_closed_cb, session_keys_change_cb, session_expiration_update_cb)); bound_cdm_created_cb.Run(cdm, ""); return; diff --git a/media/cdm/aes_decryptor.cc b/media/cdm/aes_decryptor.cc index 61dd1a2854db32..2729729e5a1c1a 100644 --- a/media/cdm/aes_decryptor.cc +++ b/media/cdm/aes_decryptor.cc @@ -270,7 +270,6 @@ static scoped_refptr DecryptData( } AesDecryptor::AesDecryptor( - const url::Origin& /* security_origin */, const SessionMessageCB& session_message_cb, const SessionClosedCB& session_closed_cb, const SessionKeysChangeCB& session_keys_change_cb, diff --git a/media/cdm/aes_decryptor.h b/media/cdm/aes_decryptor.h index e9b23a8681dc9a..cd5f7772dc50ec 100644 --- a/media/cdm/aes_decryptor.h +++ b/media/cdm/aes_decryptor.h @@ -27,10 +27,6 @@ namespace crypto { class SymmetricKey; } -namespace url { -class Origin; -} - namespace media { // Decrypts an AES encrypted buffer into an unencrypted buffer. The AES @@ -39,8 +35,7 @@ class MEDIA_EXPORT AesDecryptor : public ContentDecryptionModule, public CdmContext, public Decryptor { public: - AesDecryptor(const url::Origin& security_origin, - const SessionMessageCB& session_message_cb, + AesDecryptor(const SessionMessageCB& session_message_cb, const SessionClosedCB& session_closed_cb, const SessionKeysChangeCB& session_keys_change_cb, const SessionExpirationUpdateCB& session_expiration_update_cb); diff --git a/media/cdm/aes_decryptor_unittest.cc b/media/cdm/aes_decryptor_unittest.cc index 67f3cc49bedb9b..b24422eee191e7 100644 --- a/media/cdm/aes_decryptor_unittest.cc +++ b/media/cdm/aes_decryptor_unittest.cc @@ -31,7 +31,6 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest-param-test.h" #include "testing/gtest/include/gtest/gtest.h" -#include "url/origin.h" #if BUILDFLAG(ENABLE_LIBRARY_CDMS) #include "media/cdm/api/content_decryption_module.h" @@ -260,8 +259,7 @@ class AesDecryptorTest : public testing::TestWithParam { void SetUp() override { if (GetParam() == TestType::kAesDecryptor) { OnCdmCreated( - new AesDecryptor(url::Origin(), - base::Bind(&MockCdmClient::OnSessionMessage, + new AesDecryptor(base::Bind(&MockCdmClient::OnSessionMessage, base::Unretained(&cdm_client_)), base::Bind(&MockCdmClient::OnSessionClosed, base::Unretained(&cdm_client_)), diff --git a/media/cdm/default_cdm_factory.cc b/media/cdm/default_cdm_factory.cc index a735906cbc9952..e586a3adbad702 100644 --- a/media/cdm/default_cdm_factory.cc +++ b/media/cdm/default_cdm_factory.cc @@ -57,7 +57,7 @@ void DefaultCdmFactory::Create( } scoped_refptr cdm( - new AesDecryptor(security_origin, session_message_cb, session_closed_cb, + new AesDecryptor(session_message_cb, session_closed_cb, session_keys_change_cb, session_expiration_update_cb)); base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::Bind(cdm_created_cb, cdm, "")); diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc index 165636f0cbe30c..2ef815d0cebc90 100644 --- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc +++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc @@ -24,7 +24,6 @@ #include "media/cdm/json_web_key.h" #include "media/cdm/ppapi/cdm_file_io_test.h" #include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h" -#include "url/origin.h" #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER) const int64_t kNoTimestamp = INT64_MIN; @@ -270,8 +269,7 @@ void* CreateCdmInstance(int cdm_interface_version, if (!host) return nullptr; - // TODO(jrummell): Obtain the proper origin for this instance. - return new media::ClearKeyCdm(host, key_system_string, url::Origin()); + return new media::ClearKeyCdm(host, key_system_string); } const char* GetCdmVersion() { @@ -334,11 +332,8 @@ bool VerifyCdmHost_0(const cdm::HostFile* host_files, uint32_t num_files) { namespace media { -ClearKeyCdm::ClearKeyCdm(ClearKeyCdmHost* host, - const std::string& key_system, - const url::Origin& origin) +ClearKeyCdm::ClearKeyCdm(ClearKeyCdmHost* host, const std::string& key_system) : cdm_(new ClearKeyPersistentSessionCdm( - origin, host, base::Bind(&ClearKeyCdm::OnSessionMessage, base::Unretained(this)), base::Bind(&ClearKeyCdm::OnSessionClosed, base::Unretained(this)), diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h index af17128f93bb8d..db989cc227c995 100644 --- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h +++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h @@ -26,10 +26,6 @@ #define CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER #endif -namespace url { -class Origin; -} - namespace media { class CdmVideoDecoder; class DecoderBuffer; @@ -39,9 +35,7 @@ class FileIOTestRunner; // Clear key implementation of the cdm::ContentDecryptionModule interface. class ClearKeyCdm : public ClearKeyCdmInterface { public: - ClearKeyCdm(Host* host, - const std::string& key_system, - const url::Origin& origin); + ClearKeyCdm(Host* host, const std::string& key_system); ~ClearKeyCdm() override; // ClearKeyCdmInterface implementation. diff --git a/media/cdm/ppapi/external_clear_key/clear_key_persistent_session_cdm.cc b/media/cdm/ppapi/external_clear_key/clear_key_persistent_session_cdm.cc index c42b2021a76f1e..92095468485ad0 100644 --- a/media/cdm/ppapi/external_clear_key/clear_key_persistent_session_cdm.cc +++ b/media/cdm/ppapi/external_clear_key/clear_key_persistent_session_cdm.cc @@ -10,7 +10,6 @@ #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "media/base/cdm_promise.h" -#include "url/origin.h" namespace media { @@ -88,7 +87,6 @@ class FinishLoadCdmPromise : public SimpleCdmPromise { } // namespace ClearKeyPersistentSessionCdm::ClearKeyPersistentSessionCdm( - const url::Origin& origin, ClearKeyCdmHost* host, const SessionMessageCB& session_message_cb, const SessionClosedCB& session_closed_cb, @@ -96,7 +94,7 @@ ClearKeyPersistentSessionCdm::ClearKeyPersistentSessionCdm( const SessionExpirationUpdateCB& session_expiration_update_cb) : host_(host), session_closed_cb_(session_closed_cb), weak_factory_(this) { cdm_ = base::MakeRefCounted( - origin, session_message_cb, + session_message_cb, base::Bind(&ClearKeyPersistentSessionCdm::OnSessionClosed, weak_factory_.GetWeakPtr()), session_keys_change_cb, session_expiration_update_cb); diff --git a/media/cdm/ppapi/external_clear_key/clear_key_persistent_session_cdm.h b/media/cdm/ppapi/external_clear_key/clear_key_persistent_session_cdm.h index fd0a8d8fc5389c..2eeed47b33f909 100644 --- a/media/cdm/ppapi/external_clear_key/clear_key_persistent_session_cdm.h +++ b/media/cdm/ppapi/external_clear_key/clear_key_persistent_session_cdm.h @@ -20,10 +20,6 @@ #include "media/cdm/cdm_file_adapter.h" #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h" -namespace url { -class Origin; -} - namespace media { // This class is a wrapper on top of AesDecryptor that supports persistent @@ -32,7 +28,6 @@ namespace media { class ClearKeyPersistentSessionCdm : public ContentDecryptionModule { public: ClearKeyPersistentSessionCdm( - const url::Origin& origin, ClearKeyCdmHost* host, const SessionMessageCB& session_message_cb, const SessionClosedCB& session_closed_cb, diff --git a/media/mojo/clients/mojo_cdm_factory.cc b/media/mojo/clients/mojo_cdm_factory.cc index 2b9f400a5367a8..f911e546243188 100644 --- a/media/mojo/clients/mojo_cdm_factory.cc +++ b/media/mojo/clients/mojo_cdm_factory.cc @@ -52,7 +52,7 @@ void MojoCdmFactory::Create( #if !BUILDFLAG(ENABLE_MOJO_RENDERER) if (CanUseAesDecryptor(key_system)) { scoped_refptr cdm( - new AesDecryptor(security_origin, session_message_cb, session_closed_cb, + new AesDecryptor(session_message_cb, session_closed_cb, session_keys_change_cb, session_expiration_update_cb)); base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::Bind(cdm_created_cb, cdm, "")); diff --git a/media/test/fake_encrypted_media.cc b/media/test/fake_encrypted_media.cc index 52968ca1beea08..0445c3aa7c49f4 100644 --- a/media/test/fake_encrypted_media.cc +++ b/media/test/fake_encrypted_media.cc @@ -7,7 +7,6 @@ #include "base/bind.h" #include "media/base/cdm_key_information.h" #include "media/cdm/aes_decryptor.h" -#include "url/origin.h" namespace media { @@ -24,7 +23,6 @@ int FakeEncryptedMedia::TestCdmContext::GetCdmId() const { FakeEncryptedMedia::FakeEncryptedMedia(AppBase* app) : decryptor_(new AesDecryptor( - url::Origin(), base::Bind(&FakeEncryptedMedia::OnSessionMessage, base::Unretained(this)), base::Bind(&FakeEncryptedMedia::OnSessionClosed,