Index: media/filters/chunk_demuxer_unittest.cc |
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc |
index 7f88a6156494054287a1a1900aadac01853dc1c4..3d9b26f681ccb956b64f3efea7fdf5ec9e548a66 100644 |
--- a/media/filters/chunk_demuxer_unittest.cc |
+++ b/media/filters/chunk_demuxer_unittest.cc |
@@ -157,7 +157,7 @@ class ChunkDemuxerTest : public testing::Test { |
void CreateNewDemuxer() { |
base::Closure open_cb = |
base::Bind(&ChunkDemuxerTest::DemuxerOpened, base::Unretained(this)); |
- ChunkDemuxer::NeedKeyCB need_key_cb = |
+ Demuxer::NeedKeyCB need_key_cb = |
base::Bind(&ChunkDemuxerTest::DemuxerNeedKey, base::Unretained(this)); |
AddTextTrackCB add_text_track_cb = |
base::Bind(&ChunkDemuxerTest::OnTextTrack, base::Unretained(this)); |
@@ -856,8 +856,9 @@ class ChunkDemuxerTest : public testing::Test { |
MOCK_METHOD3(NeedKeyMock, void(const std::string& type, |
const uint8* init_data, int init_data_size)); |
void DemuxerNeedKey(const std::string& type, |
- scoped_ptr<uint8[]> init_data, int init_data_size) { |
- NeedKeyMock(type, init_data.get(), init_data_size); |
+ const std::vector<uint8>& init_data) { |
+ const uint8* init_data_ptr = init_data.empty() ? NULL : &init_data[0]; |
+ NeedKeyMock(type, init_data_ptr, init_data.size()); |
} |
scoped_ptr<TextTrack> OnTextTrack(TextKind kind, |