| Index: net/spdy/hpack_encoder_test.cc
|
| diff --git a/net/spdy/hpack_encoder_test.cc b/net/spdy/hpack_encoder_test.cc
|
| index c867f1f280ff793eec4bcf941b1c7cb98850b43a..fdc08fe19fbd04654f8b5308c5edc9d5a2690bf9 100644
|
| --- a/net/spdy/hpack_encoder_test.cc
|
| +++ b/net/spdy/hpack_encoder_test.cc
|
| @@ -20,8 +20,7 @@ namespace test {
|
|
|
| class HpackHeaderTablePeer {
|
| public:
|
| - explicit HpackHeaderTablePeer(HpackHeaderTable* table)
|
| - : table_(table) {}
|
| + explicit HpackHeaderTablePeer(HpackHeaderTable* table) : table_(table) {}
|
|
|
| HpackHeaderTable::EntryTable* dynamic_entries() {
|
| return &table_->dynamic_entries_;
|
| @@ -36,27 +35,18 @@ class HpackEncoderPeer {
|
| typedef HpackEncoder::Representation Representation;
|
| typedef HpackEncoder::Representations Representations;
|
|
|
| - explicit HpackEncoderPeer(HpackEncoder* encoder)
|
| - : encoder_(encoder) {}
|
| + explicit HpackEncoderPeer(HpackEncoder* encoder) : encoder_(encoder) {}
|
|
|
| - HpackHeaderTable* table() {
|
| - return &encoder_->header_table_;
|
| - }
|
| - HpackHeaderTablePeer table_peer() {
|
| - return HpackHeaderTablePeer(table());
|
| - }
|
| + HpackHeaderTable* table() { return &encoder_->header_table_; }
|
| + HpackHeaderTablePeer table_peer() { return HpackHeaderTablePeer(table()); }
|
| bool allow_huffman_compression() {
|
| return encoder_->allow_huffman_compression_;
|
| }
|
| void set_allow_huffman_compression(bool allow) {
|
| encoder_->allow_huffman_compression_ = allow;
|
| }
|
| - void EmitString(StringPiece str) {
|
| - encoder_->EmitString(str);
|
| - }
|
| - void TakeString(string* out) {
|
| - encoder_->output_stream_.TakeString(out);
|
| - }
|
| + void EmitString(StringPiece str) { encoder_->EmitString(str); }
|
| + void TakeString(string* out) { encoder_->output_stream_.TakeString(out); }
|
| void UpdateCharacterCounts(StringPiece str) {
|
| encoder_->UpdateCharacterCounts(str);
|
| }
|
| @@ -86,9 +76,7 @@ class HpackEncoderTest : public ::testing::Test {
|
| protected:
|
| typedef test::HpackEncoderPeer::Representations Representations;
|
|
|
| - HpackEncoderTest()
|
| - : encoder_(ObtainHpackHuffmanTable()),
|
| - peer_(&encoder_) {}
|
| + HpackEncoderTest() : encoder_(ObtainHpackHuffmanTable()), peer_(&encoder_) {}
|
|
|
| virtual void SetUp() {
|
| static_ = peer_.table()->GetByIndex(1);
|
| @@ -372,7 +360,7 @@ TEST_F(HpackEncoderTest, MultipleEncodingPasses) {
|
| headers["cookie"] = "c=dd; e=ff";
|
|
|
| ExpectIndex(cookie_c_->Index()); // Toggle on.
|
| - ExpectIndex(key_1_->Index()); // Double-toggle before eviction.
|
| + ExpectIndex(key_1_->Index()); // Double-toggle before eviction.
|
| ExpectIndex(key_1_->Index());
|
| ExpectIndexedLiteral(peer_.table()->GetByName("cookie"), "e=ff");
|
| ExpectIndex(key_2_->Index() + 1); // Toggle on. Add 1 to reflect insertion.
|
| @@ -428,7 +416,9 @@ TEST_F(HpackEncoderTest, UpdateCharacterCounts) {
|
| size_t total_counts = 0;
|
| encoder_.SetCharCountsStorage(&counts, &total_counts);
|
|
|
| - char kTestString[] = "foo\0\1\xff""boo";
|
| + char kTestString[] =
|
| + "foo\0\1\xff"
|
| + "boo";
|
| peer_.UpdateCharacterCounts(
|
| StringPiece(kTestString, arraysize(kTestString) - 1));
|
|
|
|
|