Piggybacking simulcast id and ALR experiment id into video content type extension.

webrtc/modules/video_coding/frame_buffer2_unittest.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 87 matching lines @@
 
   // In EncodedImage |_length| is used to descibe its size and |_size| to
   // describe its capacity.
   void SetSize(int size) { _length = size; }
 };
 
 class VCMReceiveStatisticsCallbackMock : public VCMReceiveStatisticsCallback {
  public:
   MOCK_METHOD2(OnReceiveRatesUpdated,
                void(uint32_t bitRate, uint32_t frameRate));
-  MOCK_METHOD2(OnCompleteFrame, void(bool is_keyframe, size_t size_bytes));
+  MOCK_METHOD3(OnCompleteFrame,
+               void(bool is_keyframe,
+                    size_t size_bytes,
+                    VideoContentType content_type));
   MOCK_METHOD1(OnDiscardedPacketsUpdated, void(int discarded_packets));
   MOCK_METHOD1(OnFrameCountsUpdated, void(const FrameCounts& frame_counts));
   MOCK_METHOD7(OnFrameBufferTimingsUpdated,
                void(int decode_ms,
                     int max_decode_ms,
                     int current_delay_ms,
                     int target_delay_ms,
                     int jitter_buffer_ms,
                     int min_playout_delay_ms,
                     int render_delay_ms));
@@ skipping 363 matching lines @@
   ExtractFrame();
   CheckFrame(1, pid - 1, 0);
   CheckNoFrame(2);
 }
 
 TEST_F(TestFrameBuffer2, StatsCallback) {
   uint16_t pid = Rand();
   uint32_t ts = Rand();
   const int kFrameSize = 5000;
 
-  EXPECT_CALL(stats_callback_, OnCompleteFrame(true, kFrameSize));
+  EXPECT_CALL(stats_callback_,
+              OnCompleteFrame(true, kFrameSize, VideoContentType::UNSPECIFIED));
   EXPECT_CALL(stats_callback_,
               OnFrameBufferTimingsUpdated(_, _, _, _, _, _, _));
 
   {
     std::unique_ptr<FrameObjectFake> frame(new FrameObjectFake());
     frame->SetSize(kFrameSize);
     frame->picture_id = pid;
     frame->spatial_layer = 0;
     frame->timestamp = ts;
     frame->num_references = 0;
@@ skipping 47 matching lines @@
   ExtractFrame(0, true);
   ExtractFrame();
 
   CheckFrame(0, 1, 0);
   CheckFrame(1, 3, 0);
   CheckNoFrame(2);
 }
 
 }  // namespace video_coding
 }  // namespace webrtc