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

Unified Diff: media/filters/chunk_demuxer_unittest.cc

Issue 23072043: Change NeedKeyCB to use std::vector. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix seek_tester, demuxer_bench, and player_x11 Created 7 years, 4 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/filters/chunk_demuxer.h ('k') | media/filters/ffmpeg_demuxer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « media/filters/chunk_demuxer.h ('k') | media/filters/ffmpeg_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698