| Index: net/tools/quic/test_tools/quic_test_utils.cc
|
| diff --git a/net/tools/quic/test_tools/quic_test_utils.cc b/net/tools/quic/test_tools/quic_test_utils.cc
|
| index 78e67cabfe948ff62ba47ef366bac2514f26f50d..65274f7a2031d8c6330969400375667d6566c8cd 100644
|
| --- a/net/tools/quic/test_tools/quic_test_utils.cc
|
| +++ b/net/tools/quic/test_tools/quic_test_utils.cc
|
| @@ -23,30 +23,32 @@ MockConnection::MockConnection(bool is_server)
|
| IPEndPoint(net::test::Loopback4(), kTestPort),
|
| new testing::NiceMock<MockHelper>(),
|
| new testing::NiceMock<MockPacketWriter>(),
|
| - is_server, QuicSupportedVersions(),
|
| + is_server,
|
| + QuicSupportedVersions(),
|
| kInitialFlowControlWindowForTest),
|
| writer_(net::test::QuicConnectionPeer::GetWriter(this)),
|
| helper_(helper()) {
|
| }
|
|
|
| -MockConnection::MockConnection(IPEndPoint address,
|
| - bool is_server)
|
| - : QuicConnection(kTestConnectionId, address,
|
| +MockConnection::MockConnection(IPEndPoint address, bool is_server)
|
| + : QuicConnection(kTestConnectionId,
|
| + address,
|
| new testing::NiceMock<MockHelper>(),
|
| new testing::NiceMock<MockPacketWriter>(),
|
| - is_server, QuicSupportedVersions(),
|
| + is_server,
|
| + QuicSupportedVersions(),
|
| kInitialFlowControlWindowForTest),
|
| writer_(net::test::QuicConnectionPeer::GetWriter(this)),
|
| helper_(helper()) {
|
| }
|
|
|
| -MockConnection::MockConnection(QuicConnectionId connection_id,
|
| - bool is_server)
|
| +MockConnection::MockConnection(QuicConnectionId connection_id, bool is_server)
|
| : QuicConnection(connection_id,
|
| IPEndPoint(net::test::Loopback4(), kTestPort),
|
| new testing::NiceMock<MockHelper>(),
|
| new testing::NiceMock<MockPacketWriter>(),
|
| - is_server, QuicSupportedVersions(),
|
| + is_server,
|
| + QuicSupportedVersions(),
|
| kInitialFlowControlWindowForTest),
|
| writer_(net::test::QuicConnectionPeer::GetWriter(this)),
|
| helper_(helper()) {
|
| @@ -58,7 +60,8 @@ MockConnection::MockConnection(bool is_server,
|
| IPEndPoint(net::test::Loopback4(), kTestPort),
|
| new testing::NiceMock<MockHelper>(),
|
| new testing::NiceMock<MockPacketWriter>(),
|
| - is_server, QuicSupportedVersions(),
|
| + is_server,
|
| + QuicSupportedVersions(),
|
| kInitialFlowControlWindowForTest),
|
| writer_(net::test::QuicConnectionPeer::GetWriter(this)),
|
| helper_(helper()) {
|
| @@ -73,19 +76,18 @@ void MockConnection::AdvanceTime(QuicTime::Delta delta) {
|
|
|
| uint64 SimpleRandom::RandUint64() {
|
| unsigned char hash[base::kSHA1Length];
|
| - base::SHA1HashBytes(reinterpret_cast<unsigned char*>(&seed_), sizeof(seed_),
|
| - hash);
|
| + base::SHA1HashBytes(
|
| + reinterpret_cast<unsigned char*>(&seed_), sizeof(seed_), hash);
|
| memcpy(&seed_, hash, sizeof(seed_));
|
| return seed_;
|
| }
|
|
|
| -TestSession::TestSession(QuicConnection* connection,
|
| - const QuicConfig& config)
|
| - : QuicSession(connection, config),
|
| - crypto_stream_(NULL) {
|
| +TestSession::TestSession(QuicConnection* connection, const QuicConfig& config)
|
| + : QuicSession(connection, config), crypto_stream_(NULL) {
|
| }
|
|
|
| -TestSession::~TestSession() {}
|
| +TestSession::~TestSession() {
|
| +}
|
|
|
| void TestSession::SetCryptoStream(QuicCryptoStream* stream) {
|
| crypto_stream_ = stream;
|
|
|