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

webrtc/video_engine/payload_router_unittest.cc

 /*
  *  Copyright (c) 2015 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 123 matching lines @@
   EXPECT_CALL(rtp_2, SendOutgoingData(_, _, _, _, _, _, _, _))
       .Times(0);
   rtp_hdr_1.simulcastIdx = 2;
   EXPECT_FALSE(payload_router_->RoutePayload(frame_type_1, payload_type_1, 0, 0,
                                              &payload_1, 1, NULL, &rtp_hdr_1));
 }
 
 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());
 
   MockRtpRtcp rtp_1;
   MockRtpRtcp rtp_2;
   std::list<RtpRtcp*> modules;
   modules.push_back(&rtp_1);
   modules.push_back(&rtp_2);
   payload_router_->SetSendingRtpModules(modules);
 
   // Modules return a higher length than the default value.
   EXPECT_CALL(rtp_1, MaxDataPayloadLength())
       .Times(1)
       .WillOnce(Return(kDefaultMaxLength + 10));
   EXPECT_CALL(rtp_2, MaxDataPayloadLength())
       .Times(1)
       .WillOnce(Return(kDefaultMaxLength + 10));
   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));
   EXPECT_CALL(rtp_2, MaxDataPayloadLength())
       .Times(1)
       .WillOnce(Return(kTestMinPayloadLength));
   EXPECT_EQ(kTestMinPayloadLength, payload_router_->MaxPayloadLength());
 }
 
 TEST_F(PayloadRouterTest, SetTargetSendBitrates) {
@@ skipping 24 matching lines @@
   bitrates.resize(3);
   bitrates[1] = bitrate_2;
   bitrates[2] = bitrate_1 + bitrate_2;
   EXPECT_CALL(rtp_1, SetTargetSendBitrate(bitrate_1))
       .Times(1);
   EXPECT_CALL(rtp_2, SetTargetSendBitrate(bitrate_2))
       .Times(1);
   payload_router_->SetTargetSendBitrates(bitrates);
 }
 }  // namespace webrtc