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

Unified Diff: media/base/video_frame_unittest.cc

Issue 2380673002: Clean up code to use VideoFrameMetadata::MergeMetadataFrom() when appropriate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clean up code to use VideoFrameMetadata::MergeMetadataFrom() when appropriate. Created 4 years, 3 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 | « content/renderer/media/webmediaplayer_ms_compositor.cc ('k') | media/renderers/skcanvas_video_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « content/renderer/media/webmediaplayer_ms_compositor.cc ('k') | media/renderers/skcanvas_video_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698