Add allocator interface for use by cdm_adapter

media/cdm/aes_decryptor_unittest.cc

 // Copyright 2013 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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/debug/leak_annotations.h"
 #include "base/json/json_reader.h"
 #include "base/macros.h"
 #include "base/values.h"
 #include "media/base/cdm_callback_promise.h"
 #include "media/base/cdm_config.h"
 #include "media/base/cdm_key_information.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
 #include "media/base/decryptor.h"
 #include "media/base/mock_filters.h"
 #include "media/cdm/aes_decryptor.h"
 #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"
 #include "url/gurl.h"
 
 using ::testing::_;
 using ::testing::Gt;
 using ::testing::IsNull;
 using ::testing::NotNull;
 using ::testing::SaveArg;
@@ skipping 201 matching lines @@
                                       base::Unretained(this)),
                            base::Bind(&AesDecryptorTest::OnSessionClosed,
                                       base::Unretained(this)),
                            base::Bind(&AesDecryptorTest::OnSessionKeysChange,
                                       base::Unretained(this))),
           std::string());
     } else if (GetParam() == "CdmAdapter") {
       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,
                      base::Unretained(this)),
           base::Bind(&AesDecryptorTest::OnSessionKeysChange,
                      base::Unretained(this)),
           base::Bind(&AesDecryptorTest::OnSessionExpirationUpdate,
                      base::Unretained(this)),
           base::Bind(&AesDecryptorTest::OnCdmCreated, base::Unretained(this)));
 
@@ skipping 751 matching lines @@
 INSTANTIATE_TEST_CASE_P(CdmAdapter,
                         AesDecryptorTest,
                         testing::Values("CdmAdapter"));
 #endif
 
 // TODO(jrummell): Once MojoCdm/MojoCdmService/MojoDecryptor/
 // MojoDecryptorService are implemented, add a third version that tests the
 // CDM via mojo.
 
 }  // namespace media