Commit bc356fe4 authored by rtenneti@chromium.org's avatar rtenneti@chromium.org

QUIC - Minor change to keep the code similar to internal source tree.

+ Minor fixes to using order, comments and chromium indentation nits.
+ Use EXPECT_EQ instead of EXPECT_TRUE.

Merge internal change: 69401047

R=rch@chromium.org,wtc@chromium.org,

Review URL: https://codereview.chromium.org/345453003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278319 0039d316-1c4b-4281-b951-d872f2087c98
parent 9feb569e
...@@ -23,10 +23,10 @@ class SendAlgorithmSimulator { ...@@ -23,10 +23,10 @@ class SendAlgorithmSimulator {
struct SentPacket { struct SentPacket {
SentPacket(QuicPacketSequenceNumber sequence_number, SentPacket(QuicPacketSequenceNumber sequence_number,
QuicTime send_time, QuicTime send_time,
QuicTime ack_time) : QuicTime ack_time)
sequence_number(sequence_number), : sequence_number(sequence_number),
send_time(send_time), send_time(send_time),
ack_time(ack_time) {} ack_time(ack_time) {}
QuicPacketSequenceNumber sequence_number; QuicPacketSequenceNumber sequence_number;
QuicTime send_time; QuicTime send_time;
QuicTime ack_time; QuicTime ack_time;
......
...@@ -439,7 +439,7 @@ TEST(CryptoServerConfigGenerationTest, SCIDIsHashOfServerConfig) { ...@@ -439,7 +439,7 @@ TEST(CryptoServerConfigGenerationTest, SCIDIsHashOfServerConfig) {
hash->Finish(digest, sizeof(digest)); hash->Finish(digest, sizeof(digest));
ASSERT_EQ(scid.size(), sizeof(digest)); ASSERT_EQ(scid.size(), sizeof(digest));
EXPECT_TRUE(0 == memcmp(digest, scid_str.data(), sizeof(digest))); EXPECT_EQ(0, memcmp(digest, scid_str.data(), sizeof(digest)));
} }
class CryptoServerTestNoConfig : public CryptoServerTest { class CryptoServerTestNoConfig : public CryptoServerTest {
......
...@@ -161,7 +161,7 @@ enum FecProtection { ...@@ -161,7 +161,7 @@ enum FecProtection {
MAY_FEC_PROTECT // Callee does not have to but may FEC protect this data. MAY_FEC_PROTECT // Callee does not have to but may FEC protect this data.
}; };
// Indicates FEC policy // Indicates FEC policy.
enum FecPolicy { enum FecPolicy {
FEC_PROTECT_ALWAYS, // All data in the stream should be FEC protected. FEC_PROTECT_ALWAYS, // All data in the stream should be FEC protected.
FEC_PROTECT_OPTIONAL // Data in the stream does not need FEC protection. FEC_PROTECT_OPTIONAL // Data in the stream does not need FEC protection.
......
...@@ -23,8 +23,8 @@ using base::StringPiece; ...@@ -23,8 +23,8 @@ using base::StringPiece;
using std::max; using std::max;
using std::min; using std::min;
using std::string; using std::string;
using testing::_;
using testing::AnyNumber; using testing::AnyNumber;
using testing::_;
namespace net { namespace net {
namespace test { namespace test {
......
...@@ -35,8 +35,7 @@ class WriteUnblockedAlarm : public QuicAlarm::Delegate { ...@@ -35,8 +35,7 @@ class WriteUnblockedAlarm : public QuicAlarm::Delegate {
// later point. // later point.
class DelayAlarm : public QuicAlarm::Delegate { class DelayAlarm : public QuicAlarm::Delegate {
public: public:
explicit DelayAlarm(PacketDroppingTestWriter* writer) explicit DelayAlarm(PacketDroppingTestWriter* writer) : writer_(writer) {}
: writer_(writer) {}
virtual QuicTime OnAlarm() OVERRIDE { virtual QuicTime OnAlarm() OVERRIDE {
return writer_->ReleaseOldPackets(); return writer_->ReleaseOldPackets();
......
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
#include "net/tools/quic/quic_epoll_connection_helper.h" #include "net/tools/quic/quic_epoll_connection_helper.h"
using base::StringPiece; using base::StringPiece;
using net::test::kInitialFlowControlWindowForTest;
using net::test::MakeAckFrame; using net::test::MakeAckFrame;
using net::test::MockHelper; using net::test::MockHelper;
using net::test::QuicConnectionPeer; using net::test::QuicConnectionPeer;
using net::test::kInitialFlowControlWindowForTest;
namespace net { namespace net {
namespace tools { namespace tools {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment