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

Unified Diff: media/cdm/aes_decryptor_unittest.cc

Issue 1673383002: Add allocator interface for use by cdm_adapter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add MEDIA_CDM_EXPORT for Windows Created 4 years, 10 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
« no previous file with comments | « media/BUILD.gn ('k') | media/cdm/cdm_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/aes_decryptor_unittest.cc
diff --git a/media/cdm/aes_decryptor_unittest.cc b/media/cdm/aes_decryptor_unittest.cc
index 82338be6a6ab7e59575a5ef88db6e1f2006319d0..47ed0ab57cd4e45a9b6fc3a4baebee5e4384b32c 100644
--- a/media/cdm/aes_decryptor_unittest.cc
+++ b/media/cdm/aes_decryptor_unittest.cc
@@ -23,6 +23,7 @@
#include "media/cdm/api/content_decryption_module.h"
#include "media/cdm/cdm_adapter.h"
#include "media/cdm/external_clear_key_test_helper.h"
+#include "media/cdm/simple_cdm_allocator.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest-param-test.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -244,10 +245,11 @@ class AesDecryptorTest : public testing::TestWithParam<std::string> {
CdmConfig cdm_config; // default settings of false are sufficient.
helper_.reset(new ExternalClearKeyTestHelper());
+ scoped_ptr<CdmAllocator> allocator(new SimpleCdmAllocator());
CdmAdapter::Create(
helper_->KeySystemName(), helper_->LibraryPath(), cdm_config,
- base::Bind(&AesDecryptorTest::OnSessionMessage,
- base::Unretained(this)),
+ std::move(allocator), base::Bind(&AesDecryptorTest::OnSessionMessage,
+ base::Unretained(this)),
base::Bind(&AesDecryptorTest::OnSessionClosed,
base::Unretained(this)),
base::Bind(&AesDecryptorTest::OnLegacySessionError,
« no previous file with comments | « media/BUILD.gn ('k') | media/cdm/cdm_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698