From a174d2ec56820f9a5da0e3e818cb7579b8271d99 Mon Sep 17 00:00:00 2001 From: "rtenneti@chromium.org" Date: Tue, 17 Dec 2013 03:20:29 +0000 Subject: [PATCH] QUIC - minor cleanup changes found while merging chromium code into internal code. R=rch@chromium.org Review URL: https://codereview.chromium.org/111323006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241129 0039d316-1c4b-4281-b951-d872f2087c98 --- net/quic/quic_data_stream.h | 2 +- net/quic/reliable_quic_stream.h | 1 - net/quic/test_tools/mock_random.h | 2 +- net/quic/test_tools/quic_connection_peer.h | 1 + net/tools/quic/quic_client.h | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/quic/quic_data_stream.h b/net/quic/quic_data_stream.h index 84990439e55b..87a5230102d1 100644 --- a/net/quic/quic_data_stream.h +++ b/net/quic/quic_data_stream.h @@ -58,12 +58,12 @@ class NET_EXPORT_PRIVATE QuicDataStream : public ReliableQuicStream, // ReliableQuicStream implementation virtual void OnClose() OVERRIDE; + virtual uint32 ProcessRawData(const char* data, uint32 data_len) OVERRIDE; // By default, this is the same as priority(), however it allows streams // to temporarily alter effective priority. For example if a SPDY stream has // compressed but not written headers it can write the headers with a higher // priority. virtual QuicPriority EffectivePriority() const OVERRIDE; - virtual uint32 ProcessRawData(const char* data, uint32 data_len) OVERRIDE; // QuicSpdyDecompressor::Visitor implementation. virtual bool OnDecompressedData(base::StringPiece data) OVERRIDE; diff --git a/net/quic/reliable_quic_stream.h b/net/quic/reliable_quic_stream.h index 7b0a79068d58..e29005dbd55b 100644 --- a/net/quic/reliable_quic_stream.h +++ b/net/quic/reliable_quic_stream.h @@ -16,7 +16,6 @@ #include "net/base/net_export.h" #include "net/quic/quic_ack_notifier.h" #include "net/quic/quic_protocol.h" -#include "net/quic/quic_spdy_compressor.h" #include "net/quic/quic_stream_sequencer.h" namespace net { diff --git a/net/quic/test_tools/mock_random.h b/net/quic/test_tools/mock_random.h index 3a3c87f4497f..ef575eccc84a 100644 --- a/net/quic/test_tools/mock_random.h +++ b/net/quic/test_tools/mock_random.h @@ -14,7 +14,7 @@ class MockRandom : public QuicRandom { public: // Initializes base_ to 0xDEADBEEF. MockRandom(); - MockRandom(uint32 base); + explicit MockRandom(uint32 base); // QuicRandom: // Fills the |data| buffer with a repeating byte, initially 'r'. diff --git a/net/quic/test_tools/quic_connection_peer.h b/net/quic/test_tools/quic_connection_peer.h index fd43661dae5d..cd7395fd5d3a 100644 --- a/net/quic/test_tools/quic_connection_peer.h +++ b/net/quic/test_tools/quic_connection_peer.h @@ -110,6 +110,7 @@ class QuicConnectionPeer { }; } // namespace test + } // namespace net #endif // NET_QUIC_TEST_TOOLS_QUIC_TEST_PEER_H_ diff --git a/net/tools/quic/quic_client.h b/net/tools/quic/quic_client.h index 02f45e6c56a8..05b305458c5e 100644 --- a/net/tools/quic/quic_client.h +++ b/net/tools/quic/quic_client.h @@ -69,7 +69,7 @@ class QuicClient : public EpollCallbackInterface, // Disconnects from the QUIC server. void Disconnect(); - // Sends a request simple GET for each URL in arg, and then waits for + // Sends a request simple GET for each URL in |args|, and then waits for // each to complete. void SendRequestsAndWaitForResponse(const CommandLine::StringVector& args); -- 2.11.4.GIT