Landing Recent QUIC changes until Sat Aug 13 04:32:36 2016 UTC-0

net/tools/quic/test_tools/quic_test_client.h

Index: net/tools/quic/test_tools/quic_test_client.h
diff --git a/net/tools/quic/test_tools/quic_test_client.h b/net/tools/quic/test_tools/quic_test_client.h
index 3ebeb2d96bbb7ea9814f32b70bf917e75d5f3430..40fd2bf5b04e101b1c5f4e8a855d5a57ee4edde1 100644
--- a/net/tools/quic/test_tools/quic_test_client.h
+++ b/net/tools/quic/test_tools/quic_test_client.h
@@ -23,6 +23,7 @@
 #include "net/tools/epoll_server/epoll_server.h"
 #include "net/tools/quic/quic_client.h"
 #include "net/tools/quic/test_tools/simple_client.h"
+#include "testing/gmock/include/gmock/gmock.h"
 
 using base::StringPiece;
 
@@ -38,7 +39,7 @@ namespace test {
 class HTTPMessage;
 class MockableQuicClient;
 
-// A quic client which allows mocking out writes.
+// A quic client which allows mocking out reads and writes.
 class MockableQuicClient : public QuicClient {
  public:
   MockableQuicClient(IPEndPoint server_address,
@@ -60,6 +61,16 @@ class MockableQuicClient : public QuicClient {
                      std::unique_ptr<ProofVerifier> proof_verifier);
 
   ~MockableQuicClient() override;
+
+  // By default, this will call QuicClient::ProcessPacket
+  MOCK_METHOD3(ProcessPacket,
+               void(const IPEndPoint&,
+                    const IPEndPoint&,
+                    const QuicReceivedPacket&));
+
+  void ProcessPacketBase(const IPEndPoint& self_address,
+                         const IPEndPoint& peer_address,
+                         const QuicReceivedPacket& packet);
   QuicPacketWriter* CreateQuicPacketWriter() override;
   QuicConnectionId GenerateNewConnectionId() override;
   void UseWriter(QuicPacketWriterWrapper* writer);