BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.

Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

1 files changed, 41 insertions, 2 deletions

diff --git a/chromium/net/quic/test_tools/quic_sent_packet_manager_peer.cc b/chromium/net/quic/test_tools/quic_sent_packet_manager_peer.cc
index 786e63c9b47..bb9fb38ee49 100644
--- a/chromium/net/quic/test_tools/quic_sent_packet_manager_peer.cc
+++ b/chromium/net/quic/test_tools/quic_sent_packet_manager_peer.cc
@@ -14,12 +14,38 @@ namespace net {
 namespace test {
 
 // static
+size_t QuicSentPacketManagerPeer::GetMaxTailLossProbes(
+    QuicSentPacketManager* sent_packet_manager) {
+  return sent_packet_manager->max_tail_loss_probes_;
+}
+
+// static
 void QuicSentPacketManagerPeer::SetMaxTailLossProbes(
     QuicSentPacketManager* sent_packet_manager, size_t max_tail_loss_probes) {
   sent_packet_manager->max_tail_loss_probes_ = max_tail_loss_probes;
 }
 
 // static
+QuicByteCount QuicSentPacketManagerPeer::GetReceiveWindow(
+    QuicSentPacketManager* sent_packet_manager) {
+  return sent_packet_manager->receive_buffer_bytes_;
+}
+
+// static
+void QuicSentPacketManagerPeer::SetIsServer(
+    QuicSentPacketManager* sent_packet_manager,
+    bool is_server) {
+  sent_packet_manager->is_server_ = is_server;
+}
+
+// static
+const SendAlgorithmInterface*
+    QuicSentPacketManagerPeer::GetSendAlgorithm(
+    const QuicSentPacketManager& sent_packet_manager) {
+  return sent_packet_manager.send_algorithm_.get();
+}
+
+// static
 void QuicSentPacketManagerPeer::SetSendAlgorithm(
     QuicSentPacketManager* sent_packet_manager,
     SendAlgorithmInterface* send_algorithm) {
@@ -82,7 +108,7 @@ bool QuicSentPacketManagerPeer::IsRetransmission(
   DCHECK(sent_packet_manager->HasRetransmittableFrames(sequence_number));
   return sent_packet_manager->HasRetransmittableFrames(sequence_number) &&
       sent_packet_manager->unacked_packets_.GetTransmissionInfo(
-          sequence_number).all_transmissions->size() > 1;
+          sequence_number).all_transmissions != nullptr;
 }
 
 // static
@@ -113,7 +139,7 @@ size_t QuicSentPacketManagerPeer::GetNumRetransmittablePackets(
   for (QuicUnackedPacketMap::const_iterator it =
            sent_packet_manager->unacked_packets_.begin();
        it != sent_packet_manager->unacked_packets_.end(); ++it) {
-    if (it->second.retransmittable_frames != NULL) {
+    if (it->retransmittable_frames != nullptr) {
       ++num_unacked_packets;
     }
   }
@@ -126,5 +152,18 @@ QuicByteCount QuicSentPacketManagerPeer::GetBytesInFlight(
   return sent_packet_manager->unacked_packets_.bytes_in_flight();
 }
 
+// static
+QuicSentPacketManager::NetworkChangeVisitor*
+    QuicSentPacketManagerPeer::GetNetworkChangeVisitor(
+        const QuicSentPacketManager* sent_packet_manager) {
+  return sent_packet_manager->network_change_visitor_;
+}
+
+// static
+QuicSustainedBandwidthRecorder& QuicSentPacketManagerPeer::GetBandwidthRecorder(
+    QuicSentPacketManager* sent_packet_manager) {
+  return sent_packet_manager->sustained_bandwidth_recorder_;
+}
+
 }  // namespace test
 }  // namespace net