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

Unified Diff: media/mojo/services/media_type_converters_unittest.cc

Issue 1255083004: media: Mojo interfaces renaming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
Index: media/mojo/services/media_type_converters_unittest.cc
diff --git a/media/mojo/services/media_type_converters_unittest.cc b/media/mojo/services/media_type_converters_unittest.cc
index 2da7ca5b2b8d39ce516ded46b33eca87842b2af9..5ca24c2c7d6e4ecb8b9a3b0394a25baec2cdafb3 100644
--- a/media/mojo/services/media_type_converters_unittest.cc
+++ b/media/mojo/services/media_type_converters_unittest.cc
@@ -29,8 +29,7 @@ TEST(MediaTypeConvertersTest, ConvertDecoderBuffer_Normal) {
base::TimeDelta::FromMilliseconds(6)));
// Convert from and back.
- interfaces::MediaDecoderBufferPtr ptr(
- interfaces::MediaDecoderBuffer::From(buffer));
+ interfaces::DecoderBufferPtr ptr(interfaces::DecoderBuffer::From(buffer));
scoped_refptr<DecoderBuffer> result(ptr.To<scoped_refptr<DecoderBuffer>>());
// Compare.
@@ -55,8 +54,7 @@ TEST(MediaTypeConvertersTest, ConvertDecoderBuffer_EOS) {
scoped_refptr<DecoderBuffer> buffer(DecoderBuffer::CreateEOSBuffer());
// Convert from and back.
- interfaces::MediaDecoderBufferPtr ptr(
- interfaces::MediaDecoderBuffer::From(buffer));
+ interfaces::DecoderBufferPtr ptr(interfaces::DecoderBuffer::From(buffer));
scoped_refptr<DecoderBuffer> result(ptr.To<scoped_refptr<DecoderBuffer>>());
// Compare.
@@ -74,8 +72,7 @@ TEST(MediaTypeConvertersTest, ConvertDecoderBuffer_KeyFrame) {
EXPECT_TRUE(buffer->is_key_frame());
// Convert from and back.
- interfaces::MediaDecoderBufferPtr ptr(
- interfaces::MediaDecoderBuffer::From(buffer));
+ interfaces::DecoderBufferPtr ptr(interfaces::DecoderBuffer::From(buffer));
scoped_refptr<DecoderBuffer> result(ptr.To<scoped_refptr<DecoderBuffer>>());
// Compare.
@@ -103,8 +100,7 @@ TEST(MediaTypeConvertersTest, ConvertDecoderBuffer_EncryptedBuffer) {
make_scoped_ptr(new DecryptConfig(kKeyId, kIv, subsamples)));
// Convert from and back.
- interfaces::MediaDecoderBufferPtr ptr(
- interfaces::MediaDecoderBuffer::From(buffer));
+ interfaces::DecoderBufferPtr ptr(interfaces::DecoderBuffer::From(buffer));
scoped_refptr<DecoderBuffer> result(ptr.To<scoped_refptr<DecoderBuffer>>());
// Compare.
@@ -116,7 +112,7 @@ TEST(MediaTypeConvertersTest, ConvertDecoderBuffer_EncryptedBuffer) {
// Test empty IV. This is used for clear buffer in an encrypted stream.
buffer->set_decrypt_config(make_scoped_ptr(
new DecryptConfig(kKeyId, "", std::vector<SubsampleEntry>())));
- result = interfaces::MediaDecoderBuffer::From(buffer)
+ result = interfaces::DecoderBuffer::From(buffer)
.To<scoped_refptr<DecoderBuffer>>();
EXPECT_TRUE(buffer->decrypt_config()->Matches(*result->decrypt_config()));
EXPECT_TRUE(buffer->decrypt_config()->iv().empty());

Powered by Google App Engine
This is Rietveld 408576698