Index: net/quic/quic_stream_sequencer_test.cc |
diff --git a/net/quic/quic_stream_sequencer_test.cc b/net/quic/quic_stream_sequencer_test.cc |
index 1875e686409972eff24d84f7ad39b24d66f6991e..0ffb95094fc01f97016e09e71c19c51d744a69bd 100644 |
--- a/net/quic/quic_stream_sequencer_test.cc |
+++ b/net/quic/quic_stream_sequencer_test.cc |
@@ -33,8 +33,7 @@ namespace test { |
class QuicStreamSequencerPeer : public QuicStreamSequencer { |
public: |
explicit QuicStreamSequencerPeer(ReliableQuicStream* stream) |
- : QuicStreamSequencer(stream) { |
- } |
+ : QuicStreamSequencer(stream) {} |
virtual bool OnFinFrame(QuicStreamOffset byte_offset, const char* data) { |
QuicStreamFrame frame; |
@@ -62,21 +61,18 @@ class QuicStreamSequencerPeer : public QuicStreamSequencer { |
class MockStream : public ReliableQuicStream { |
public: |
MockStream(QuicSession* session, QuicStreamId id) |
- : ReliableQuicStream(id, session) { |
- } |
+ : ReliableQuicStream(id, session) {} |
MOCK_METHOD0(OnFinRead, void()); |
MOCK_METHOD2(ProcessRawData, uint32(const char* data, uint32 data_len)); |
- MOCK_METHOD2(CloseConnectionWithDetails, void(QuicErrorCode error, |
- const string& details)); |
+ MOCK_METHOD2(CloseConnectionWithDetails, |
+ void(QuicErrorCode error, const string& details)); |
MOCK_METHOD1(Reset, void(QuicRstStreamErrorCode error)); |
MOCK_METHOD0(OnCanWrite, void()); |
virtual QuicPriority EffectivePriority() const { |
return QuicUtils::HighestPriority(); |
} |
- virtual bool IsFlowControlEnabled() const { |
- return true; |
- } |
+ virtual bool IsFlowControlEnabled() const { return true; } |
}; |
namespace { |
@@ -90,13 +86,12 @@ class QuicStreamSequencerTest : public ::testing::Test { |
: connection_(new MockConnection(false)), |
session_(connection_), |
stream_(&session_, 1), |
- sequencer_(new QuicStreamSequencerPeer(&stream_)) { |
- } |
+ sequencer_(new QuicStreamSequencerPeer(&stream_)) {} |
bool VerifyReadableRegions(const char** expected, size_t num_expected) { |
iovec iovecs[5]; |
- size_t num_iovecs = sequencer_->GetReadableRegions(iovecs, |
- arraysize(iovecs)); |
+ size_t num_iovecs = |
+ sequencer_->GetReadableRegions(iovecs, arraysize(iovecs)); |
return VerifyIovecs(iovecs, num_iovecs, expected, num_expected); |
} |
@@ -105,8 +100,8 @@ class QuicStreamSequencerTest : public ::testing::Test { |
const char** expected, |
size_t num_expected) { |
if (num_expected != num_iovecs) { |
- LOG(ERROR) << "Incorrect number of iovecs. Expected: " |
- << num_expected << " Actual: " << num_iovecs; |
+ LOG(ERROR) << "Incorrect number of iovecs. Expected: " << num_expected |
+ << " Actual: " << num_iovecs; |
return false; |
} |
for (size_t i = 0; i < num_expected; ++i) { |
@@ -119,8 +114,8 @@ class QuicStreamSequencerTest : public ::testing::Test { |
bool VerifyIovec(const iovec& iovec, StringPiece expected) { |
if (iovec.iov_len != expected.length()) { |
- LOG(ERROR) << "Invalid length: " << iovec.iov_len |
- << " vs " << expected.length(); |
+ LOG(ERROR) << "Invalid length: " << iovec.iov_len << " vs " |
+ << expected.length(); |
return false; |
} |
if (memcmp(iovec.iov_base, expected.data(), expected.length()) != 0) { |
@@ -138,8 +133,7 @@ class QuicStreamSequencerTest : public ::testing::Test { |
}; |
TEST_F(QuicStreamSequencerTest, RejectOldFrame) { |
- EXPECT_CALL(stream_, ProcessRawData(StrEq("abc"), 3)) |
- .WillOnce(Return(3)); |
+ EXPECT_CALL(stream_, ProcessRawData(StrEq("abc"), 3)).WillOnce(Return(3)); |
EXPECT_TRUE(sequencer_->OnFrame(0, "abc")); |
EXPECT_EQ(0u, sequencer_->frames()->size()); |
@@ -266,7 +260,6 @@ TEST_F(QuicStreamSequencerTest, OutOfOrderFrameProcessed) { |
EXPECT_EQ(0u, sequencer_->frames()->size()); |
} |
- |
TEST_F(QuicStreamSequencerTest, BasicHalfCloseOrdered) { |
InSequence s; |
@@ -310,7 +303,7 @@ TEST_F(QuicStreamSequencerTest, TerminateWithReadv) { |
EXPECT_CALL(stream_, ProcessRawData(StrEq("abc"), 3)).WillOnce(Return(0)); |
EXPECT_TRUE(sequencer_->OnFrame(0, "abc")); |
- iovec iov = { &buffer[0], 3 }; |
+ iovec iov = {&buffer[0], 3}; |
int bytes_read = sequencer_->Readv(&iov, 1); |
EXPECT_EQ(3, bytes_read); |
EXPECT_TRUE(sequencer_->IsClosed()); |
@@ -348,13 +341,9 @@ class QuicSequencerRandomTest : public QuicStreamSequencerTest { |
} |
} |
- QuicSequencerRandomTest() { |
- CreateFrames(); |
- } |
+ QuicSequencerRandomTest() { CreateFrames(); } |
- int OneToN(int n) { |
- return base::RandInt(1, n); |
- } |
+ int OneToN(int n) { return base::RandInt(1, n); } |
int MaybeProcessMaybeBuffer(const char* data, uint32 len) { |
int to_process = len; |
@@ -383,8 +372,8 @@ TEST_F(QuicSequencerRandomTest, RandomFramesNoDroppingNoBackup) { |
int index = OneToN(list_.size()) - 1; |
LOG(ERROR) << "Sending index " << index << " " |
<< list_[index].second.data(); |
- EXPECT_TRUE(sequencer_->OnFrame(list_[index].first, |
- list_[index].second.data())); |
+ EXPECT_TRUE( |
+ sequencer_->OnFrame(list_[index].first, list_[index].second.data())); |
list_.erase(list_.begin() + index); |
} |