diff --git a/webrtc/video_engine/test/common/rtp_rtcp_observer.h b/webrtc/video_engine/test/common/rtp_rtcp_observer.h
index 2bc0865326..581e0fd5db 100644
--- a/webrtc/video_engine/test/common/rtp_rtcp_observer.h
+++ b/webrtc/video_engine/test/common/rtp_rtcp_observer.h
@@ -102,7 +102,9 @@ class RtpRtcpObserver {
         case SEND_PACKET:
           return test::DirectTransport::SendRTP(packet, length);
       }
+      return true;  // Will never happen, makes compiler happy.
     }
+
     virtual bool SendRTCP(const uint8_t* packet, size_t length) OVERRIDE {
       Action action;
       {
@@ -116,6 +118,7 @@ class RtpRtcpObserver {
         case SEND_PACKET:
           return test::DirectTransport::SendRTCP(packet, length);
       }
+      return true;  // Will never happen, makes compiler happy.
     }
 
     // Pointer to shared lock instance protecting on_rtp_/on_rtcp_ calls.
diff --git a/webrtc/video_engine/test/engine_tests.cc b/webrtc/video_engine/test/engine_tests.cc
index d99ce0273a..71c3c81ee2 100644
--- a/webrtc/video_engine/test/engine_tests.cc
+++ b/webrtc/video_engine/test/engine_tests.cc
@@ -279,7 +279,8 @@ class PliObserver : public test::RtpRtcpObserver {
 
   virtual Action OnSendRtp(const uint8_t* packet, size_t length) OVERRIDE {
     RTPHeader header;
-    EXPECT_TRUE(rtp_header_parser_->Parse(packet, length, &header));
+    EXPECT_TRUE(
+        rtp_header_parser_->Parse(packet, static_cast<int>(length), &header));
 
     // Drop all NACK retransmissions. This is to force transmission of a PLI.
     if (header.timestamp < last_send_timestamp_)