Wire up VCMTiming in FrameBuffer2.

webrtc/modules/video_coding/frame_buffer2.h

Index: webrtc/modules/video_coding/frame_buffer2.h
diff --git a/webrtc/modules/video_coding/frame_buffer2.h b/webrtc/modules/video_coding/frame_buffer2.h
index 3201f627ce88d8d51919763397806b42e1912740..6dc24bad221ff416c67c27f4f192bde9258c0f17 100644
--- a/webrtc/modules/video_coding/frame_buffer2.h
+++ b/webrtc/modules/video_coding/frame_buffer2.h
@@ -21,6 +21,7 @@
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/event.h"
 #include "webrtc/base/thread_annotations.h"
+#include "webrtc/modules/video_coding/inter_frame_delay.h"
 
 namespace webrtc {
 
@@ -36,7 +37,7 @@ class FrameBuffer {
  public:
   FrameBuffer(Clock* clock,
               VCMJitterEstimator* jitter_estimator,
-              const VCMTiming* timing);
+              VCMTiming* timing);
 
   // Insert a frame into the frame buffer.
   void InsertFrame(std::unique_ptr<FrameObject> frame);
@@ -79,7 +80,8 @@ class FrameBuffer {
   Clock* const clock_;
   rtc::Event frame_inserted_event_;
   VCMJitterEstimator* const jitter_estimator_;
-  const VCMTiming* const timing_;
+  VCMTiming* const timing_;
+  VCMInterFrameDelay inter_frame_delay_;
   int newest_picture_id_ GUARDED_BY(crit_);
   bool stopped_ GUARDED_BY(crit_);