Index: net/quic/quic_framer_test.cc |
diff --git a/net/quic/quic_framer_test.cc b/net/quic/quic_framer_test.cc |
index 535d31aef70b620d7cc5639f38e8a3545d27addd..9ba0fd6e4bbcf8d04443e668ec73c0cad1b72d1f 100644 |
--- a/net/quic/quic_framer_test.cc |
+++ b/net/quic/quic_framer_test.cc |
@@ -104,43 +104,43 @@ const size_t kPublicResetPacketMessageTagOffset = |
class TestEncrypter : public QuicEncrypter { |
public: |
virtual ~TestEncrypter() {} |
- virtual bool SetKey(StringPiece key) OVERRIDE { |
+ virtual bool SetKey(StringPiece key) override { |
return true; |
} |
- virtual bool SetNoncePrefix(StringPiece nonce_prefix) OVERRIDE { |
+ virtual bool SetNoncePrefix(StringPiece nonce_prefix) override { |
return true; |
} |
virtual bool Encrypt(StringPiece nonce, |
StringPiece associated_data, |
StringPiece plaintext, |
- unsigned char* output) OVERRIDE { |
+ unsigned char* output) override { |
CHECK(false) << "Not implemented"; |
return false; |
} |
virtual QuicData* EncryptPacket(QuicPacketSequenceNumber sequence_number, |
StringPiece associated_data, |
- StringPiece plaintext) OVERRIDE { |
+ StringPiece plaintext) override { |
sequence_number_ = sequence_number; |
associated_data_ = associated_data.as_string(); |
plaintext_ = plaintext.as_string(); |
return new QuicData(plaintext.data(), plaintext.length()); |
} |
- virtual size_t GetKeySize() const OVERRIDE { |
+ virtual size_t GetKeySize() const override { |
return 0; |
} |
- virtual size_t GetNoncePrefixSize() const OVERRIDE { |
+ virtual size_t GetNoncePrefixSize() const override { |
return 0; |
} |
- virtual size_t GetMaxPlaintextSize(size_t ciphertext_size) const OVERRIDE { |
+ virtual size_t GetMaxPlaintextSize(size_t ciphertext_size) const override { |
return ciphertext_size; |
} |
- virtual size_t GetCiphertextSize(size_t plaintext_size) const OVERRIDE { |
+ virtual size_t GetCiphertextSize(size_t plaintext_size) const override { |
return plaintext_size; |
} |
- virtual StringPiece GetKey() const OVERRIDE { |
+ virtual StringPiece GetKey() const override { |
return StringPiece(); |
} |
- virtual StringPiece GetNoncePrefix() const OVERRIDE { |
+ virtual StringPiece GetNoncePrefix() const override { |
return StringPiece(); |
} |
QuicPacketSequenceNumber sequence_number_; |
@@ -151,32 +151,32 @@ class TestEncrypter : public QuicEncrypter { |
class TestDecrypter : public QuicDecrypter { |
public: |
virtual ~TestDecrypter() {} |
- virtual bool SetKey(StringPiece key) OVERRIDE { |
+ virtual bool SetKey(StringPiece key) override { |
return true; |
} |
- virtual bool SetNoncePrefix(StringPiece nonce_prefix) OVERRIDE { |
+ virtual bool SetNoncePrefix(StringPiece nonce_prefix) override { |
return true; |
} |
virtual bool Decrypt(StringPiece nonce, |
StringPiece associated_data, |
StringPiece ciphertext, |
unsigned char* output, |
- size_t* output_length) OVERRIDE { |
+ size_t* output_length) override { |
CHECK(false) << "Not implemented"; |
return false; |
} |
virtual QuicData* DecryptPacket(QuicPacketSequenceNumber sequence_number, |
StringPiece associated_data, |
- StringPiece ciphertext) OVERRIDE { |
+ StringPiece ciphertext) override { |
sequence_number_ = sequence_number; |
associated_data_ = associated_data.as_string(); |
ciphertext_ = ciphertext.as_string(); |
return new QuicData(ciphertext.data(), ciphertext.length()); |
} |
- virtual StringPiece GetKey() const OVERRIDE { |
+ virtual StringPiece GetKey() const override { |
return StringPiece(); |
} |
- virtual StringPiece GetNoncePrefix() const OVERRIDE { |
+ virtual StringPiece GetNoncePrefix() const override { |
return StringPiece(); |
} |
QuicPacketSequenceNumber sequence_number_; |
@@ -207,121 +207,121 @@ class TestQuicVisitor : public ::net::QuicFramerVisitorInterface { |
STLDeleteElements(&fec_data_); |
} |
- virtual void OnError(QuicFramer* f) OVERRIDE { |
+ virtual void OnError(QuicFramer* f) override { |
DVLOG(1) << "QuicFramer Error: " << QuicUtils::ErrorToString(f->error()) |
<< " (" << f->error() << ")"; |
++error_count_; |
} |
- virtual void OnPacket() OVERRIDE {} |
+ virtual void OnPacket() override {} |
virtual void OnPublicResetPacket( |
- const QuicPublicResetPacket& packet) OVERRIDE { |
+ const QuicPublicResetPacket& packet) override { |
public_reset_packet_.reset(new QuicPublicResetPacket(packet)); |
} |
virtual void OnVersionNegotiationPacket( |
- const QuicVersionNegotiationPacket& packet) OVERRIDE { |
+ const QuicVersionNegotiationPacket& packet) override { |
version_negotiation_packet_.reset(new QuicVersionNegotiationPacket(packet)); |
} |
- virtual void OnRevivedPacket() OVERRIDE { |
+ virtual void OnRevivedPacket() override { |
++revived_packets_; |
} |
- virtual bool OnProtocolVersionMismatch(QuicVersion version) OVERRIDE { |
+ virtual bool OnProtocolVersionMismatch(QuicVersion version) override { |
DVLOG(1) << "QuicFramer Version Mismatch, version: " << version; |
++version_mismatch_; |
return true; |
} |
virtual bool OnUnauthenticatedPublicHeader( |
- const QuicPacketPublicHeader& header) OVERRIDE { |
+ const QuicPacketPublicHeader& header) override { |
public_header_.reset(new QuicPacketPublicHeader(header)); |
return accept_public_header_; |
} |
virtual bool OnUnauthenticatedHeader( |
- const QuicPacketHeader& header) OVERRIDE { |
+ const QuicPacketHeader& header) override { |
return true; |
} |
- virtual void OnDecryptedPacket(EncryptionLevel level) OVERRIDE {} |
+ virtual void OnDecryptedPacket(EncryptionLevel level) override {} |
- virtual bool OnPacketHeader(const QuicPacketHeader& header) OVERRIDE { |
+ virtual bool OnPacketHeader(const QuicPacketHeader& header) override { |
++packet_count_; |
header_.reset(new QuicPacketHeader(header)); |
return accept_packet_; |
} |
- virtual bool OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE { |
+ virtual bool OnStreamFrame(const QuicStreamFrame& frame) override { |
++frame_count_; |
stream_frames_.push_back(new QuicStreamFrame(frame)); |
return true; |
} |
- virtual void OnFecProtectedPayload(StringPiece payload) OVERRIDE { |
+ virtual void OnFecProtectedPayload(StringPiece payload) override { |
fec_protected_payload_ = payload.as_string(); |
} |
- virtual bool OnAckFrame(const QuicAckFrame& frame) OVERRIDE { |
+ virtual bool OnAckFrame(const QuicAckFrame& frame) override { |
++frame_count_; |
ack_frames_.push_back(new QuicAckFrame(frame)); |
return true; |
} |
virtual bool OnCongestionFeedbackFrame( |
- const QuicCongestionFeedbackFrame& frame) OVERRIDE { |
+ const QuicCongestionFeedbackFrame& frame) override { |
++frame_count_; |
congestion_feedback_frames_.push_back( |
new QuicCongestionFeedbackFrame(frame)); |
return true; |
} |
- virtual bool OnStopWaitingFrame(const QuicStopWaitingFrame& frame) OVERRIDE { |
+ virtual bool OnStopWaitingFrame(const QuicStopWaitingFrame& frame) override { |
++frame_count_; |
stop_waiting_frames_.push_back(new QuicStopWaitingFrame(frame)); |
return true; |
} |
- virtual bool OnPingFrame(const QuicPingFrame& frame) OVERRIDE { |
+ virtual bool OnPingFrame(const QuicPingFrame& frame) override { |
++frame_count_; |
ping_frames_.push_back(new QuicPingFrame(frame)); |
return true; |
} |
- virtual void OnFecData(const QuicFecData& fec) OVERRIDE { |
+ virtual void OnFecData(const QuicFecData& fec) override { |
++fec_count_; |
fec_data_.push_back(new QuicFecData(fec)); |
} |
- virtual void OnPacketComplete() OVERRIDE { |
+ virtual void OnPacketComplete() override { |
++complete_packets_; |
} |
- virtual bool OnRstStreamFrame(const QuicRstStreamFrame& frame) OVERRIDE { |
+ virtual bool OnRstStreamFrame(const QuicRstStreamFrame& frame) override { |
rst_stream_frame_ = frame; |
return true; |
} |
virtual bool OnConnectionCloseFrame( |
- const QuicConnectionCloseFrame& frame) OVERRIDE { |
+ const QuicConnectionCloseFrame& frame) override { |
connection_close_frame_ = frame; |
return true; |
} |
- virtual bool OnGoAwayFrame(const QuicGoAwayFrame& frame) OVERRIDE { |
+ virtual bool OnGoAwayFrame(const QuicGoAwayFrame& frame) override { |
goaway_frame_ = frame; |
return true; |
} |
virtual bool OnWindowUpdateFrame(const QuicWindowUpdateFrame& frame) |
- OVERRIDE { |
+ override { |
window_update_frame_ = frame; |
return true; |
} |
- virtual bool OnBlockedFrame(const QuicBlockedFrame& frame) OVERRIDE { |
+ virtual bool OnBlockedFrame(const QuicBlockedFrame& frame) override { |
blocked_frame_ = frame; |
return true; |
} |