Enable cast_unittests

And fixed associated errors

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=228002

Review URL: https://codereview.chromium.org/26486005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228515 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 5 deletions

diff --git a/media/cast/video_sender/video_sender_unittest.cc b/media/cast/video_sender/video_sender_unittest.cc
index b5819e3..fc29492 100644
--- a/media/cast/video_sender/video_sender_unittest.cc
+++ b/media/cast/video_sender/video_sender_unittest.cc
@@ -20,6 +20,7 @@ namespace media {
 namespace cast {
 
 static const int64 kStartMillisecond = GG_INT64_C(12345678900000);
+static const uint8 kPixelValue = 123;
 
 using testing::_;
 
@@ -96,19 +97,19 @@ class VideoSenderTest : public ::testing::Test {
     video_frame->y_plane.length = video_frame->width;
     video_frame->y_plane.data =
         new uint8[video_frame->width * video_frame->height];
-    memset(video_frame->y_plane.data, 123,
+    memset(video_frame->y_plane.data, kPixelValue,
         video_frame->width * video_frame->height);
     video_frame->u_plane.stride = video_frame->width / 2;
     video_frame->u_plane.length = video_frame->width / 2;
     video_frame->u_plane.data =
         new uint8[video_frame->width * video_frame->height / 4];
-    memset(video_frame->u_plane.data, 123,
+    memset(video_frame->u_plane.data, kPixelValue,
         video_frame->width * video_frame->height / 4);
     video_frame->v_plane.stride = video_frame->width / 2;
     video_frame->v_plane.length = video_frame->width / 2;
     video_frame->v_plane.data =
         new uint8[video_frame->width * video_frame->height / 4];
-    memset(video_frame->v_plane.data, 123,
+    memset(video_frame->v_plane.data, kPixelValue,
         video_frame->width * video_frame->height / 4);
     return video_frame;
   }
@@ -146,14 +147,14 @@ TEST_F(VideoSenderTest, ExternalEncoder) {
   video_frame.key_frame = true;
   video_frame.frame_id = 0;
   video_frame.last_referenced_frame_id = 0;
-  video_frame.data.insert(video_frame.data.begin(), 123, 1000);
+  video_frame.data.insert(video_frame.data.begin(), 1000, kPixelValue);
 
   video_sender_->InsertCodedVideoFrame(&video_frame, capture_time,
     base::Bind(&ReleaseEncodedFrame, &video_frame));
 }
 
 TEST_F(VideoSenderTest, RtcpTimer) {
-  EXPECT_CALL(mock_transport_, SendRtcpPacket(_)).Times(2);
+  EXPECT_CALL(mock_transport_, SendRtcpPacket(_)).Times(1);
   InitEncoder(false);
 
   // Make sure that we send at least one RTCP packet.