net/quic/test_tools/quic_test_utils.h - Issue 266243004: Clang format slam.

Unified Diff: net/quic/test_tools/quic_test_utils.h

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: net/quic/test_tools/quic_test_utils.h

diff --git a/net/quic/test_tools/quic_test_utils.h b/net/quic/test_tools/quic_test_utils.h

index 620dfe90e53748be976b4d05c9ca9c2f549770e5..ef2a55d67ff8b0f2c21bef5c7f0700c6708e3c1d 100644

--- a/net/quic/test_tools/quic_test_utils.h

+++ b/net/quic/test_tools/quic_test_utils.h

@@ -82,17 +82,13 @@ QuicVersionVector SupportedVersions(QuicVersion version);

QuicAckFrame MakeAckFrame(QuicPacketSequenceNumber largest_observed,

QuicPacketSequenceNumber least_unacked);

-template<typename SaveType>

+template <typename SaveType>

class ValueRestore {

public:

- ValueRestore(SaveType* name, SaveType value)

- : name_(name),

- value_(*name) {

+ ValueRestore(SaveType* name, SaveType value) : name_(name), value_(*name) {

*name_ = value;

}

- ~ValueRestore() {

- *name_ = value_;

- }

+ ~ValueRestore() { *name_ = value_; }

private:

SaveType* name_;

@@ -117,8 +113,8 @@ class MockFramerVisitor : public QuicFramerVisitorInterface {

// The constructor sets this up to return true by default.

MOCK_METHOD1(OnUnauthenticatedHeader, bool(const QuicPacketHeader& header));

// The constructor sets this up to return true by default.

- MOCK_METHOD1(OnUnauthenticatedPublicHeader, bool(

- const QuicPacketPublicHeader& header));

+ MOCK_METHOD1(OnUnauthenticatedPublicHeader,

+ bool(const QuicPacketPublicHeader& header));

MOCK_METHOD1(OnDecryptedPacket, void(EncryptionLevel level));

MOCK_METHOD1(OnPacketHeader, bool(const QuicPacketHeader& header));

MOCK_METHOD1(OnFecProtectedPayload, void(base::StringPiece payload));

@@ -163,8 +159,7 @@ class NoOpFramerVisitor : public QuicFramerVisitorInterface {

virtual bool OnAckFrame(const QuicAckFrame& frame) OVERRIDE;

virtual bool OnCongestionFeedbackFrame(

const QuicCongestionFeedbackFrame& frame) OVERRIDE;

- virtual bool OnStopWaitingFrame(

- const QuicStopWaitingFrame& frame) OVERRIDE;

+ virtual bool OnStopWaitingFrame(const QuicStopWaitingFrame& frame) OVERRIDE;

virtual bool OnPingFrame(const QuicPingFrame& frame) OVERRIDE;

virtual void OnFecData(const QuicFecData& fec) OVERRIDE {}

virtual bool OnRstStreamFrame(const QuicRstStreamFrame& frame) OVERRIDE;

@@ -241,23 +236,26 @@ class MockConnection : public QuicConnection {

// will advance the time of the MockClock.

void AdvanceTime(QuicTime::Delta delta);

- MOCK_METHOD3(ProcessUdpPacket, void(const IPEndPoint& self_address,

- const IPEndPoint& peer_address,

- const QuicEncryptedPacket& packet));

+ MOCK_METHOD3(ProcessUdpPacket,

+ void(const IPEndPoint& self_address,

+ const IPEndPoint& peer_address,

+ const QuicEncryptedPacket& packet));

MOCK_METHOD1(SendConnectionClose, void(QuicErrorCode error));

- MOCK_METHOD2(SendConnectionCloseWithDetails, void(QuicErrorCode error,

- const string& details));

- MOCK_METHOD2(SendConnectionClosePacket, void(QuicErrorCode error,

- const string& details));

- MOCK_METHOD3(SendRstStream, void(QuicStreamId id,

- QuicRstStreamErrorCode error,

- QuicStreamOffset bytes_written));

- MOCK_METHOD3(SendGoAway, void(QuicErrorCode error,

- QuicStreamId last_good_stream_id,

- const string& reason));

+ MOCK_METHOD2(SendConnectionCloseWithDetails,

+ void(QuicErrorCode error, const string& details));

+ MOCK_METHOD2(SendConnectionClosePacket,

+ void(QuicErrorCode error, const string& details));

+ MOCK_METHOD3(SendRstStream,

+ void(QuicStreamId id,

+ QuicRstStreamErrorCode error,

+ QuicStreamOffset bytes_written));

+ MOCK_METHOD3(SendGoAway,

+ void(QuicErrorCode error,

+ QuicStreamId last_good_stream_id,

+ const string& reason));

MOCK_METHOD1(SendBlocked, void(QuicStreamId id));

- MOCK_METHOD2(SendWindowUpdate, void(QuicStreamId id,

- QuicStreamOffset byte_offset));

+ MOCK_METHOD2(SendWindowUpdate,

+ void(QuicStreamId id, QuicStreamOffset byte_offset));

MOCK_METHOD0(OnCanWrite, void());

void ProcessUdpPacketInternal(const IPEndPoint& self_address,

@@ -311,16 +309,16 @@ class MockSession : public QuicSession {

QuicStreamOffset offset,

bool fin,

QuicAckNotifier::DelegateInterface*));

- MOCK_METHOD2(OnStreamHeaders, void(QuicStreamId stream_id,

- base::StringPiece headers_data));

- MOCK_METHOD2(OnStreamHeadersPriority, void(QuicStreamId stream_id,

- QuicPriority priority));

- MOCK_METHOD3(OnStreamHeadersComplete, void(QuicStreamId stream_id,

- bool fin,

- size_t frame_len));

- MOCK_METHOD3(SendRstStream, void(QuicStreamId stream_id,

- QuicRstStreamErrorCode error,

- QuicStreamOffset bytes_written));

+ MOCK_METHOD2(OnStreamHeaders,

+ void(QuicStreamId stream_id, base::StringPiece headers_data));

+ MOCK_METHOD2(OnStreamHeadersPriority,

+ void(QuicStreamId stream_id, QuicPriority priority));

+ MOCK_METHOD3(OnStreamHeadersComplete,

+ void(QuicStreamId stream_id, bool fin, size_t frame_len));

+ MOCK_METHOD3(SendRstStream,

+ void(QuicStreamId stream_id,

+ QuicRstStreamErrorCode error,

+ QuicStreamOffset bytes_written));

MOCK_METHOD0(IsCryptoHandshakeConfirmed, bool());

using QuicSession::ActivateStream;

@@ -400,17 +398,19 @@ class MockSendAlgorithm : public SendAlgorithmInterface {

MOCK_METHOD2(OnIncomingQuicCongestionFeedbackFrame,

void(const QuicCongestionFeedbackFrame&,

QuicTime feedback_receive_time));

- MOCK_METHOD2(OnPacketAcked,

- void(QuicPacketSequenceNumber, QuicByteCount));

+ MOCK_METHOD2(OnPacketAcked, void(QuicPacketSequenceNumber, QuicByteCount));

MOCK_METHOD2(OnPacketLost, void(QuicPacketSequenceNumber, QuicTime));

MOCK_METHOD4(OnPacketSent,

- bool(QuicTime sent_time, QuicPacketSequenceNumber, QuicByteCount,

+ bool(QuicTime sent_time,

+ QuicPacketSequenceNumber,

+ QuicByteCount,

HasRetransmittableData));

MOCK_METHOD1(OnRetransmissionTimeout, void(bool));

- MOCK_METHOD2(OnPacketAbandoned, void(QuicPacketSequenceNumber sequence_number,

- QuicByteCount abandoned_bytes));

- MOCK_METHOD2(TimeUntilSend, QuicTime::Delta(QuicTime now,

- HasRetransmittableData));

+ MOCK_METHOD2(OnPacketAbandoned,

+ void(QuicPacketSequenceNumber sequence_number,

+ QuicByteCount abandoned_bytes));

+ MOCK_METHOD2(TimeUntilSend,

+ QuicTime::Delta(QuicTime now, HasRetransmittableData));

MOCK_CONST_METHOD0(BandwidthEstimate, QuicBandwidth(void));

MOCK_METHOD1(OnRttUpdated, void(QuicPacketSequenceNumber));

MOCK_CONST_METHOD0(RetransmissionDelay, QuicTime::Delta(void));

@@ -437,8 +437,8 @@ class MockLossAlgorithm : public LossDetectionInterface {

DISALLOW_COPY_AND_ASSIGN(MockLossAlgorithm);

};

-class TestEntropyCalculator :

- public QuicReceivedEntropyHashCalculatorInterface {

+class TestEntropyCalculator

+ : public QuicReceivedEntropyHashCalculatorInterface {

public:

TestEntropyCalculator();

virtual ~TestEntropyCalculator();

@@ -467,11 +467,12 @@ class MockAckNotifierDelegate : public QuicAckNotifier::DelegateInterface {

public:

MockAckNotifierDelegate();

- MOCK_METHOD5(OnAckNotification, void(int num_original_packets,

- int num_original_bytes,

- int num_retransmitted_packets,

- int num_retransmitted_bytes,

- QuicTime::Delta delta_largest_observed));

+ MOCK_METHOD5(OnAckNotification,

+ void(int num_original_packets,

+ int num_original_bytes,

+ int num_retransmitted_packets,

+ int num_retransmitted_bytes,

+ QuicTime::Delta delta_largest_observed));

protected:

// Object is ref counted.

« net/base/mime_util_unittest.cc ('K') | « net/quic/test_tools/quic_test_packet_maker.cc ('k') | net/quic/test_tools/quic_test_utils.cc » ('j') | no next file with comments »