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

Unified Diff: media/cdm/cdm_adapter_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/cdm/cdm_adapter.cc ('k') | media/cdm/cdm_allocator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/cdm_adapter_unittest.cc
diff --git a/media/cdm/cdm_adapter_unittest.cc b/media/cdm/cdm_adapter_unittest.cc
index 46de9244e02e10beba5691d440a71156232d0006..ae743852835e4087128a6ead96869435eaf19573 100644
--- a/media/cdm/cdm_adapter_unittest.cc
+++ b/media/cdm/cdm_adapter_unittest.cc
@@ -14,6 +14,7 @@
#include "media/base/media_keys.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.h"
@@ -80,9 +81,10 @@ class CdmAdapterTest : public testing::Test {
void InitializeAndExpect(base::FilePath library_path,
ExpectedResult expected_result) {
CdmConfig cdm_config; // default settings of false are sufficient.
+ scoped_ptr<CdmAllocator> allocator(new SimpleCdmAllocator());
CdmAdapter::Create(
- helper_.KeySystemName(), library_path, cdm_config,
+ helper_.KeySystemName(), library_path, cdm_config, std::move(allocator),
base::Bind(&CdmAdapterTest::OnSessionMessage, base::Unretained(this)),
base::Bind(&CdmAdapterTest::OnSessionClosed, base::Unretained(this)),
base::Bind(&CdmAdapterTest::OnLegacySessionError,
« no previous file with comments | « media/cdm/cdm_adapter.cc ('k') | media/cdm/cdm_allocator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698