| Index: net/quic/test_tools/simple_quic_framer.cc
|
| diff --git a/net/quic/test_tools/simple_quic_framer.cc b/net/quic/test_tools/simple_quic_framer.cc
|
| index 8141e1d7d265fa5cf7329b5013f8d90e981bd29e..cbe0b6d5463e827a19f7e43228464e768f5b4cd8 100644
|
| --- a/net/quic/test_tools/simple_quic_framer.cc
|
| +++ b/net/quic/test_tools/simple_quic_framer.cc
|
| @@ -18,13 +18,9 @@ namespace test {
|
|
|
| class SimpleFramerVisitor : public QuicFramerVisitorInterface {
|
| public:
|
| - SimpleFramerVisitor()
|
| - : error_(QUIC_NO_ERROR) {
|
| - }
|
| + SimpleFramerVisitor() : error_(QUIC_NO_ERROR) {}
|
|
|
| - virtual ~SimpleFramerVisitor() {
|
| - STLDeleteElements(&stream_data_);
|
| - }
|
| + virtual ~SimpleFramerVisitor() { STLDeleteElements(&stream_data_); }
|
|
|
| virtual void OnError(QuicFramer* framer) OVERRIDE {
|
| error_ = framer->error();
|
| @@ -41,8 +37,7 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface {
|
| }
|
| virtual void OnVersionNegotiationPacket(
|
| const QuicVersionNegotiationPacket& packet) OVERRIDE {
|
| - version_negotiation_packet_.reset(
|
| - new QuicVersionNegotiationPacket(packet));
|
| + version_negotiation_packet_.reset(new QuicVersionNegotiationPacket(packet));
|
| }
|
| virtual void OnRevivedPacket() OVERRIDE {}
|
|
|
| @@ -151,12 +146,8 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface {
|
| const vector<QuicStopWaitingFrame>& stop_waiting_frames() const {
|
| return stop_waiting_frames_;
|
| }
|
| - const vector<QuicPingFrame>& ping_frames() const {
|
| - return ping_frames_;
|
| - }
|
| - const QuicFecData& fec_data() const {
|
| - return fec_data_;
|
| - }
|
| + const vector<QuicPingFrame>& ping_frames() const { return ping_frames_; }
|
| + const QuicFecData& fec_data() const { return fec_data_; }
|
| const QuicVersionNegotiationPacket* version_negotiation_packet() const {
|
| return version_negotiation_packet_.get();
|
| }
|
| @@ -199,8 +190,8 @@ SimpleQuicFramer::~SimpleQuicFramer() {
|
| }
|
|
|
| bool SimpleQuicFramer::ProcessPacket(const QuicPacket& packet) {
|
| - scoped_ptr<QuicEncryptedPacket> encrypted(framer_.EncryptPacket(
|
| - ENCRYPTION_NONE, 0, packet));
|
| + scoped_ptr<QuicEncryptedPacket> encrypted(
|
| + framer_.EncryptPacket(ENCRYPTION_NONE, 0, packet));
|
| return ProcessPacket(*encrypted);
|
| }
|
|
|
| @@ -214,7 +205,6 @@ void SimpleQuicFramer::Reset() {
|
| visitor_.reset(new SimpleFramerVisitor);
|
| }
|
|
|
| -
|
| const QuicPacketHeader& SimpleQuicFramer::header() const {
|
| return visitor_->header();
|
| }
|
| @@ -237,22 +227,18 @@ QuicFramer* SimpleQuicFramer::framer() {
|
| }
|
|
|
| size_t SimpleQuicFramer::num_frames() const {
|
| - return ack_frames().size() +
|
| - feedback_frames().size() +
|
| - goaway_frames().size() +
|
| - rst_stream_frames().size() +
|
| - stop_waiting_frames().size() +
|
| - stream_frames().size() +
|
| - ping_frames().size() +
|
| - connection_close_frames().size();
|
| + return ack_frames().size() + feedback_frames().size() +
|
| + goaway_frames().size() + rst_stream_frames().size() +
|
| + stop_waiting_frames().size() + stream_frames().size() +
|
| + ping_frames().size() + connection_close_frames().size();
|
| }
|
|
|
| const vector<QuicAckFrame>& SimpleQuicFramer::ack_frames() const {
|
| return visitor_->ack_frames();
|
| }
|
|
|
| -const vector<QuicStopWaitingFrame>&
|
| -SimpleQuicFramer::stop_waiting_frames() const {
|
| +const vector<QuicStopWaitingFrame>& SimpleQuicFramer::stop_waiting_frames()
|
| + const {
|
| return visitor_->stop_waiting_frames();
|
| }
|
|
|
| @@ -268,13 +254,12 @@ const vector<QuicRstStreamFrame>& SimpleQuicFramer::rst_stream_frames() const {
|
| return visitor_->rst_stream_frames();
|
| }
|
|
|
| -const vector<QuicCongestionFeedbackFrame>&
|
| -SimpleQuicFramer::feedback_frames() const {
|
| +const vector<QuicCongestionFeedbackFrame>& SimpleQuicFramer::feedback_frames()
|
| + const {
|
| return visitor_->feedback_frames();
|
| }
|
|
|
| -const vector<QuicGoAwayFrame>&
|
| -SimpleQuicFramer::goaway_frames() const {
|
| +const vector<QuicGoAwayFrame>& SimpleQuicFramer::goaway_frames() const {
|
| return visitor_->goaway_frames();
|
| }
|
|
|
|
|