Add allocator interface for use by cdm_adapter

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 <stdint.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "media/base/cdm_callback_promise.h"
 #include "media/base/cdm_key_information.h"
 #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"
 
 using ::testing::_;
 using ::testing::SaveArg;
 MATCHER(IsNotEmpty, "") {
   return !arg.empty();
 }
 
 // TODO(jrummell): These tests are a subset of those in aes_decryptor_unittest.
@@ skipping 46 matching lines @@
 
   CdmAdapterTest() {}
   ~CdmAdapterTest() override {}
 
  protected:
   // Initializes the adapter. |expected_result| tests that the call succeeds
   // or generates an error.
   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,
                    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));
@@ skipping 217 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