Add metadata to media::VideoFrame and plumb it through IPC/MediaStream.

content/renderer/media/mock_media_stream_video_source.cc

 // Copyright 2014 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 "content/renderer/media/mock_media_stream_video_source.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 
@@ skipping 60 matching lines @@
 }
 
 void MockMediaStreamVideoSource::StopSourceImpl() {
 }
 
 void MockMediaStreamVideoSource::DeliverVideoFrame(
     const scoped_refptr<media::VideoFrame>& frame) {
   DCHECK(!frame_callback_.is_null());
   io_message_loop()->PostTask(
       FROM_HERE,
-      base::Bind(&MockMediaStreamVideoSource::DeliverVideoFrameOnIO,
-                 base::Unretained(this), frame, format_,
-                 base::TimeTicks(), frame_callback_));
-}
-
-void MockMediaStreamVideoSource::DeliverVideoFrameOnIO(
-    const scoped_refptr<media::VideoFrame>& frame,
-    media::VideoCaptureFormat format,
-    const base::TimeTicks& estimated_capture_time,
-    const VideoCaptureDeliverFrameCB& frame_callback) {
-  frame_callback.Run(frame, format, estimated_capture_time);
+      base::Bind(frame_callback_, frame, base::TimeTicks()));
 }
 
 }  // namespace content