1 files changed, 30 insertions, 16 deletions
diff --git a/chromium/net/quic/test_tools/crypto_test_utils.cc b/chromium/net/quic/test_tools/crypto_test_utils.cc
index 73b5bab080a..a6b6cc1ed85 100644
--- a/chromium/net/quic/test_tools/crypto_test_utils.cc
+++ b/chromium/net/quic/test_tools/crypto_test_utils.cc
@@ -7,7 +7,7 @@
 #include "net/quic/crypto/channel_id.h"
 #include "net/quic/crypto/common_cert_set.h"
 #include "net/quic/crypto/crypto_handshake.h"
-#include "net/quic/crypto/crypto_server_config.h"
+#include "net/quic/crypto/quic_crypto_server_config.h"
 #include "net/quic/crypto/quic_decrypter.h"
 #include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/crypto/quic_random.h"
@@ -20,6 +20,8 @@
 #include "net/quic/test_tools/simple_quic_framer.h"
 
 using base::StringPiece;
+using std::make_pair;
+using std::pair;
 using std::string;
 using std::vector;
 
@@ -84,7 +86,8 @@ void MovePackets(PacketSavingConnection* source_conn,
     for (vector<QuicStreamFrame>::const_iterator
          i =  framer.stream_frames().begin();
          i != framer.stream_frames().end(); ++i) {
-      ASSERT_TRUE(crypto_framer.ProcessInput(i->data));
+      scoped_ptr<string> frame_data(i->GetDataAsString());
+      ASSERT_TRUE(crypto_framer.ProcessInput(*frame_data));
       ASSERT_FALSE(crypto_visitor.error());
     }
   }
@@ -130,13 +133,8 @@ CryptoTestUtils::FakeClientOptions::FakeClientOptions()
 int CryptoTestUtils::HandshakeWithFakeServer(
     PacketSavingConnection* client_conn,
     QuicCryptoClientStream* client) {
-  QuicGuid guid(1);
-  IPAddressNumber ip;
-  CHECK(ParseIPLiteralToNumber("192.0.2.33", &ip));
-  IPEndPoint addr = IPEndPoint(ip, 1);
-  PacketSavingConnection* server_conn =
-      new PacketSavingConnection(guid, addr, true);
-  TestSession server_session(server_conn, QuicConfig(), true);
+  PacketSavingConnection* server_conn = new PacketSavingConnection(true);
+  TestSession server_session(server_conn, DefaultQuicConfig());
 
   QuicCryptoServerConfig crypto_config(QuicCryptoServerConfig::TESTING,
                                        QuicRandom::GetInstance());
@@ -163,13 +161,8 @@ int CryptoTestUtils::HandshakeWithFakeClient(
     PacketSavingConnection* server_conn,
     QuicCryptoServerStream* server,
     const FakeClientOptions& options) {
-  QuicGuid guid(1);
-  IPAddressNumber ip;
-  CHECK(ParseIPLiteralToNumber("192.0.2.33", &ip));
-  IPEndPoint addr = IPEndPoint(ip, 1);
-  PacketSavingConnection* client_conn =
-      new PacketSavingConnection(guid, addr, false);
-  TestSession client_session(client_conn, QuicConfig(), false);
+  PacketSavingConnection* client_conn = new PacketSavingConnection(false);
+  TestSession client_session(client_conn, DefaultQuicConfig());
   QuicCryptoClientConfig crypto_config;
 
   client_session.config()->SetDefaults();
@@ -237,6 +230,27 @@ void CryptoTestUtils::CommunicateHandshakeMessages(
   }
 }
 
+pair<size_t, size_t> CryptoTestUtils::AdvanceHandshake(
+    PacketSavingConnection* a_conn,
+    QuicCryptoStream* a,
+    size_t a_i,
+    PacketSavingConnection* b_conn,
+    QuicCryptoStream* b,
+    size_t b_i) {
+  LOG(INFO) << "Processing " << a_conn->packets_.size() - a_i
+            << " packets a->b";
+  MovePackets(a_conn, &a_i, b, b_conn);
+
+  LOG(INFO) << "Processing " << b_conn->packets_.size() - b_i
+            << " packets b->a";
+  if (b_conn->packets_.size() - b_i == 2) {
+    LOG(INFO) << "here";
+  }
+  MovePackets(b_conn, &b_i, a, a_conn);
+
+  return make_pair(a_i, b_i);
+}
+
 // static
 string CryptoTestUtils::GetValueForTag(const CryptoHandshakeMessage& message,
                                        QuicTag tag) {