Fix Visual Studio 2015 WebRtc x86 build.

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 acaa4006c4186092311dd37387602032b981f320..68c299a95ea0e83f40d349d016c143d4ce8ce621 100644
--- a/webrtc/video_engine/payload_router_unittest.cc
+++ b/webrtc/video_engine/payload_router_unittest.cc
@@ -141,7 +141,7 @@ TEST_F(PayloadRouterTest, SendSimulcast) {
 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 size_t kDefaultMaxLength = 1500 - 20 - 8 - 12 - 4;
+  const uint16_t kDefaultMaxLength = 1500 - 20 - 8 - 12 - 4;

[tlegrand-webrtc, 2016/01/21 14:54:06]

Don't change the type here.

[mflodman, 2016/01/22 08:33:04]

Good catch! I had a too old local checkout when I verified this, so I agree this
be size_t if you rebase your checkout.

   EXPECT_EQ(kDefaultMaxLength, payload_router_->DefaultMaxPayloadLength());
   EXPECT_EQ(kDefaultMaxLength, payload_router_->MaxPayloadLength());
 
@@ -162,7 +162,7 @@ TEST_F(PayloadRouterTest, MaxPayloadLength) {
   EXPECT_EQ(kDefaultMaxLength, payload_router_->MaxPayloadLength());
 
   // The modules return a value lower than default.
-  const size_t kTestMinPayloadLength = 1001;
+  const uint16_t kTestMinPayloadLength = 1001;

[tlegrand-webrtc, 2016/01/21 14:54:06]

Same here, keep size_t.

   EXPECT_CALL(rtp_1, MaxDataPayloadLength())
       .Times(1)
       .WillOnce(Return(kTestMinPayloadLength + 10));