Modifying video_frame.cc to copy all metadata values, instead of only END_OF_STREAM, and updating u…

media/base/video_frame_metadata.cc

Index: media/base/video_frame_metadata.cc
diff --git a/media/base/video_frame_metadata.cc b/media/base/video_frame_metadata.cc
index 2ecf002550cd523d1c48dbee27144f5b47b9794d..596983785280b4259227a3060113afbe4f312a88 100644
--- a/media/base/video_frame_metadata.cc
+++ b/media/base/video_frame_metadata.cc
@@ -145,6 +145,13 @@ void VideoFrameMetadata::MergeInternalValuesFrom(
   dictionary_.MergeDictionary(&in);
 }
 
+void VideoFrameMetadata::MergeMetadataFrom(

[DaleCurtis, 2016/03/03 21:44:51]

After this lands there are a few places you can cleanup too:

https://code.google.com/p/chromium/codesearch#search/&q=base::DictionaryValue...

(not all of those are valid, but some are)

[tguilbert, 2016/03/03 23:40:28]

Will do!

+    const VideoFrameMetadata* metadata_source) {
+  base::DictionaryValue temp_metadata_values;
+  metadata_source->MergeInternalValuesInto(&temp_metadata_values);
+  MergeInternalValuesFrom(temp_metadata_values);

[watk, 2016/03/03 22:54:33]

I think you can simplify this to:

dictionary_.MergeDictionary(&metadata_source->dictionary_);

[tguilbert, 2016/03/03 23:40:28]

Done.

+}
+
 const base::BinaryValue* VideoFrameMetadata::GetBinaryValue(Key key) const {
   const base::Value* internal_value = nullptr;
   if (dictionary_.GetWithoutPathExpansion(ToInternalKey(key),