BASELINE: Update Chromium to 47.0.2526.14

Also adding in sources needed for spellchecking.

Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

1 files changed, 28 insertions, 10 deletions

diff --git a/chromium/net/quic/test_tools/quic_connection_peer.cc b/chromium/net/quic/test_tools/quic_connection_peer.cc
index df7d9e78e27..5bd6370d977 100644
--- a/chromium/net/quic/test_tools/quic_connection_peer.cc
+++ b/chromium/net/quic/test_tools/quic_connection_peer.cc
@@ -76,10 +76,10 @@ QuicTime::Delta QuicConnectionPeer::GetNetworkTimeout(
 // TODO(ianswett): Create a GetSentEntropyHash which accepts an AckFrame.
 QuicPacketEntropyHash QuicConnectionPeer::GetSentEntropyHash(
     QuicConnection* connection,
-    QuicPacketSequenceNumber sequence_number) {
+    QuicPacketNumber packet_number) {
   QuicSentEntropyManager::CumulativeEntropy last_entropy_copy =
       connection->sent_entropy_manager_.last_cumulative_entropy_;
-  connection->sent_entropy_manager_.UpdateCumulativeEntropy(sequence_number,
+  connection->sent_entropy_manager_.UpdateCumulativeEntropy(packet_number,
                                                             &last_entropy_copy);
   return last_entropy_copy.entropy;
 }
@@ -87,16 +87,15 @@ QuicPacketEntropyHash QuicConnectionPeer::GetSentEntropyHash(
 // static
 QuicPacketEntropyHash QuicConnectionPeer::PacketEntropy(
     QuicConnection* connection,
-    QuicPacketSequenceNumber sequence_number) {
-  return connection->sent_entropy_manager_.GetPacketEntropy(sequence_number);
+    QuicPacketNumber packet_number) {
+  return connection->sent_entropy_manager_.GetPacketEntropy(packet_number);
 }
 
 // static
 QuicPacketEntropyHash QuicConnectionPeer::ReceivedEntropyHash(
     QuicConnection* connection,
-    QuicPacketSequenceNumber sequence_number) {
-  return connection->received_packet_manager_.EntropyHash(
-      sequence_number);
+    QuicPacketNumber packet_number) {
+  return connection->received_packet_manager_.EntropyHash(packet_number);
 }
 
 // static
@@ -224,9 +223,10 @@ QuicPacketHeader* QuicConnectionPeer::GetLastHeader(
 }
 
 // static
-void QuicConnectionPeer::SetSequenceNumberOfLastSentPacket(
-    QuicConnection* connection, QuicPacketSequenceNumber number) {
-  connection->sequence_number_of_last_sent_packet_ = number;
+void QuicConnectionPeer::SetPacketNumberOfLastSentPacket(
+    QuicConnection* connection,
+    QuicPacketNumber number) {
+  connection->packet_number_of_last_sent_packet_ = number;
 }
 
 // static
@@ -234,5 +234,23 @@ QuicConnectionStats* QuicConnectionPeer::GetStats(QuicConnection* connection) {
   return &connection->stats_;
 }
 
+// static
+QuicPacketCount QuicConnectionPeer::GetPacketsBetweenMtuProbes(
+    QuicConnection* connection) {
+  return connection->packets_between_mtu_probes_;
+}
+
+// static
+void QuicConnectionPeer::SetPacketsBetweenMtuProbes(QuicConnection* connection,
+                                                    QuicPacketCount packets) {
+  connection->packets_between_mtu_probes_ = packets;
+}
+
+// static
+void QuicConnectionPeer::SetNextMtuProbeAt(QuicConnection* connection,
+                                           QuicPacketNumber number) {
+  connection->next_mtu_probe_at_ = number;
+}
+
 }  // namespace test
 }  // namespace net