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

Unified Diff: media/webm/webm_cluster_parser_unittest.cc

Issue 119203003: Drop DecryptConfig::data_offset_. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 7 years 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
Index: media/webm/webm_cluster_parser_unittest.cc
diff --git a/media/webm/webm_cluster_parser_unittest.cc b/media/webm/webm_cluster_parser_unittest.cc
index 691325d74031f420670b46eaff62496f6ad8ba3a..865a274237ee16140f86ef5e27a6f79567751dd6 100644
--- a/media/webm/webm_cluster_parser_unittest.cc
+++ b/media/webm/webm_cluster_parser_unittest.cc
@@ -183,13 +183,11 @@ static bool VerifyTextBuffers(
return true;
}
-static bool VerifyEncryptedBuffer(
+static void VerifyEncryptedBuffer(
scoped_refptr<StreamParserBuffer> buffer) {
EXPECT_TRUE(buffer->decrypt_config());
EXPECT_EQ(static_cast<unsigned long>(DecryptConfig::kDecryptionKeySize),
buffer->decrypt_config()->iv().length());
- const uint8* data = buffer->data();
- return data[0] & kWebMFlagEncryptedFrame;
}
static void AppendToEnd(const WebMClusterParser::BufferQueue& src,
@@ -508,7 +506,7 @@ TEST_F(WebMClusterParserTest, ParseEncryptedBlock) {
EXPECT_EQ(cluster->size(), result);
ASSERT_EQ(1UL, parser_->video_buffers().size());
scoped_refptr<StreamParserBuffer> buffer = parser_->video_buffers()[0];
- EXPECT_TRUE(VerifyEncryptedBuffer(buffer));
+ VerifyEncryptedBuffer(buffer);
}
TEST_F(WebMClusterParserTest, ParseBadEncryptedBlock) {

Powered by Google App Engine
This is Rietveld 408576698