| Index: media/base/video_frame_unittest.cc
|
| diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc
|
| index ea03e032b62540192c35479c544f964dcab42cf7..730496abc1fe61cdd1a4357db15e2b9564ea342d 100644
|
| --- a/media/base/video_frame_unittest.cc
|
| +++ b/media/base/video_frame_unittest.cc
|
| @@ -500,12 +500,8 @@ TEST(VideoFrameMetadata, PassMetadataViaIntermediary) {
|
| expected.SetInteger(key, i);
|
| }
|
|
|
| - base::DictionaryValue tmp;
|
| - expected.MergeInternalValuesInto(&tmp);
|
| - EXPECT_EQ(static_cast<size_t>(VideoFrameMetadata::NUM_KEYS), tmp.size());
|
| -
|
| VideoFrameMetadata result;
|
| - result.MergeInternalValuesFrom(tmp);
|
| + result.MergeMetadataFrom(&expected);
|
|
|
| for (int i = 0; i < VideoFrameMetadata::NUM_KEYS; ++i) {
|
| const VideoFrameMetadata::Key key = static_cast<VideoFrameMetadata::Key>(i);
|
|
|