Clean up code to use VideoFrameMetadata::MergeMetadataFrom() when appropriate.

media/base/video_frame_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/video_frame.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
@@ skipping 482 matching lines @@
   }
 }
 
 TEST(VideoFrameMetadata, PassMetadataViaIntermediary) {
   VideoFrameMetadata expected;
   for (int i = 0; i < VideoFrameMetadata::NUM_KEYS; ++i) {
     const VideoFrameMetadata::Key key = static_cast<VideoFrameMetadata::Key>(i);
     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);
     int value = -1;
     EXPECT_TRUE(result.GetInteger(key, &value));
     EXPECT_EQ(i, value);
   }
 }
 
 }  // namespace media