Revert of With these changes, WebRtc x86 will build Visual Studio 2015.

webrtc/video_engine/payload_router_unittest.cc

Index: webrtc/video_engine/payload_router_unittest.cc
diff --git a/webrtc/video_engine/payload_router_unittest.cc b/webrtc/video_engine/payload_router_unittest.cc
index 117b0eeb31ffbfc4124436b44b0c7a11edc319c1..acaa4006c4186092311dd37387602032b981f320 100644
--- a/webrtc/video_engine/payload_router_unittest.cc
+++ b/webrtc/video_engine/payload_router_unittest.cc
@@ -141,7 +141,7 @@
 TEST_F(PayloadRouterTest, MaxPayloadLength) {
   // Without any limitations from the modules, verify we get the max payload
   // length for IP/UDP/SRTP with a MTU of 150 bytes.
-  const uint16_t kDefaultMaxLength = 1500 - 20 - 8 - 12 - 4;
+  const size_t kDefaultMaxLength = 1500 - 20 - 8 - 12 - 4;
   EXPECT_EQ(kDefaultMaxLength, payload_router_->DefaultMaxPayloadLength());
   EXPECT_EQ(kDefaultMaxLength, payload_router_->MaxPayloadLength());
 
@@ -162,7 +162,7 @@
   EXPECT_EQ(kDefaultMaxLength, payload_router_->MaxPayloadLength());
 
   // The modules return a value lower than default.
-  const uint16_t kTestMinPayloadLength = 1001;
+  const size_t kTestMinPayloadLength = 1001;
   EXPECT_CALL(rtp_1, MaxDataPayloadLength())
       .Times(1)
       .WillOnce(Return(kTestMinPayloadLength + 10));