Reland of Use initial bitrates for software VP8.

webrtc/media/base/videoengine_unittest.h

Index: webrtc/media/base/videoengine_unittest.h
diff --git a/webrtc/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h
index 394b9c9a8e912a8398edca46aae86f58da24955c..60f1155931ede2ef7afd89995251e4f1bd99520e 100644
--- a/webrtc/media/base/videoengine_unittest.h
+++ b/webrtc/media/base/videoengine_unittest.h
@@ -1063,7 +1063,16 @@
   void TwoStreamsSendAndReceive(const cricket::VideoCodec& codec) {
     SetUpSecondStream();
     // Test sending and receiving on first stream.
-    SendAndReceive(codec);
+    EXPECT_TRUE(SetOneCodec(codec));
+    EXPECT_TRUE(SetSend(true));
+    EXPECT_TRUE(channel_->SetSink(kDefaultReceiveSsrc, &renderer_));
+    EXPECT_EQ(0, renderer_.num_rendered_frames());
+    EXPECT_TRUE(SendFrame());
+    // Since multiple streams share this link we should be receiving smaller
+    // initial frames (start at QVGA since shared bitrate is 150k each).
+    EXPECT_FRAME_WAIT(1, codec.width / 2, codec.height / 2, kTimeout);
+    std::unique_ptr<const rtc::CopyOnWriteBuffer> p(GetRtpPacket(0));
+    EXPECT_EQ(codec.id, GetPayloadType(p.get()));
     // Test sending and receiving on second stream.
     EXPECT_EQ_WAIT(1, renderer2_.num_rendered_frames(), kTimeout);
     EXPECT_GT(NumRtpPackets(), 0);