Revert of Add EncodedImageCallback::OnEncodedImage().

webrtc/video/payload_router_unittest.cc

Index: webrtc/video/payload_router_unittest.cc
diff --git a/webrtc/video/payload_router_unittest.cc b/webrtc/video/payload_router_unittest.cc
index def76b73a6588620b6159ca5846625a3b9c9f827..62dba29c05e72873b977a40be9f6159e2fcc2706 100644
--- a/webrtc/video/payload_router_unittest.cc
+++ b/webrtc/video/payload_router_unittest.cc
@@ -44,7 +44,7 @@
   EXPECT_CALL(rtp, SendOutgoingData(encoded_image._frameType, payload_type,
                                     encoded_image._timeStamp,
                                     encoded_image.capture_time_ms_, &payload,
-                                    encoded_image._length, nullptr, _, _))
+                                    encoded_image._length, nullptr, _))
       .Times(0);
   EXPECT_EQ(-1, payload_router.Encoded(encoded_image, nullptr, nullptr));
 
@@ -52,7 +52,7 @@
   EXPECT_CALL(rtp, SendOutgoingData(encoded_image._frameType, payload_type,
                                     encoded_image._timeStamp,
                                     encoded_image.capture_time_ms_, &payload,
-                                    encoded_image._length, nullptr, _, _))
+                                    encoded_image._length, nullptr, _))
       .Times(1);
   EXPECT_EQ(0, payload_router.Encoded(encoded_image, nullptr, nullptr));
 
@@ -60,7 +60,7 @@
   EXPECT_CALL(rtp, SendOutgoingData(encoded_image._frameType, payload_type,
                                     encoded_image._timeStamp,
                                     encoded_image.capture_time_ms_, &payload,
-                                    encoded_image._length, nullptr, _, _))
+                                    encoded_image._length, nullptr, _))
       .Times(0);
   EXPECT_EQ(-1, payload_router.Encoded(encoded_image, nullptr, nullptr));
 
@@ -68,7 +68,7 @@
   EXPECT_CALL(rtp, SendOutgoingData(encoded_image._frameType, payload_type,
                                     encoded_image._timeStamp,
                                     encoded_image.capture_time_ms_, &payload,
-                                    encoded_image._length, nullptr, _, _))
+                                    encoded_image._length, nullptr, _))
       .Times(1);
   EXPECT_EQ(0, payload_router.Encoded(encoded_image, nullptr, nullptr));
 
@@ -77,7 +77,7 @@
   EXPECT_CALL(rtp, SendOutgoingData(encoded_image._frameType, payload_type,
                                     encoded_image._timeStamp,
                                     encoded_image.capture_time_ms_, &payload,
-                                    encoded_image._length, nullptr, _, _))
+                                    encoded_image._length, nullptr, _))
       .Times(0);
   EXPECT_EQ(-1, payload_router.Encoded(encoded_image, nullptr, nullptr));
 }
@@ -111,9 +111,10 @@
   EXPECT_CALL(rtp_1, SendOutgoingData(encoded_image._frameType, payload_type,
                                       encoded_image._timeStamp,
                                       encoded_image.capture_time_ms_, &payload,
-                                      encoded_image._length, nullptr, _, _))
+                                      encoded_image._length, nullptr, _))
       .Times(1);
-  EXPECT_CALL(rtp_2, SendOutgoingData(_, _, _, _, _, _, _, _, _)).Times(0);
+  EXPECT_CALL(rtp_2, SendOutgoingData(_, _, _, _, _, _, _, _))
+      .Times(0);
   EXPECT_EQ(0, payload_router.Encoded(encoded_image, &codec_info_1, nullptr));
 
   CodecSpecificInfo codec_info_2;
@@ -124,17 +125,17 @@
   EXPECT_CALL(rtp_2, SendOutgoingData(encoded_image._frameType, payload_type,
                                       encoded_image._timeStamp,
                                       encoded_image.capture_time_ms_, &payload,
-                                      encoded_image._length, nullptr, _, _))
+                                      encoded_image._length, nullptr, _))
       .Times(1);
-  EXPECT_CALL(rtp_1, SendOutgoingData(_, _, _, _, _, _, _, _, _))
+  EXPECT_CALL(rtp_1, SendOutgoingData(_, _, _, _, _, _, _, _))
       .Times(0);
   EXPECT_EQ(0, payload_router.Encoded(encoded_image, &codec_info_2, nullptr));
 
   // Inactive.
   payload_router.set_active(false);
-  EXPECT_CALL(rtp_1, SendOutgoingData(_, _, _, _, _, _, _, _, _))
+  EXPECT_CALL(rtp_1, SendOutgoingData(_, _, _, _, _, _, _, _))
       .Times(0);
-  EXPECT_CALL(rtp_2, SendOutgoingData(_, _, _, _, _, _, _, _, _))
+  EXPECT_CALL(rtp_2, SendOutgoingData(_, _, _, _, _, _, _, _))
       .Times(0);
   EXPECT_EQ(-1, payload_router.Encoded(encoded_image, &codec_info_1, nullptr));
   EXPECT_EQ(-1, payload_router.Encoded(encoded_image, &codec_info_2, nullptr));
@@ -143,9 +144,9 @@
   streams.pop_back();  // Remove a stream.
   payload_router.SetSendStreams(streams);
   payload_router.set_active(true);
-  EXPECT_CALL(rtp_1, SendOutgoingData(_, _, _, _, _, _, _, _, _))
+  EXPECT_CALL(rtp_1, SendOutgoingData(_, _, _, _, _, _, _, _))
       .Times(0);
-  EXPECT_CALL(rtp_2, SendOutgoingData(_, _, _, _, _, _, _, _, _))
+  EXPECT_CALL(rtp_2, SendOutgoingData(_, _, _, _, _, _, _, _))
       .Times(0);
   codec_info_2.codecSpecific.VP8.simulcastIdx = 1;
   EXPECT_EQ(-1, payload_router.Encoded(encoded_image, &codec_info_2, nullptr));