Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(225)

Unified Diff: net/spdy/core/spdy_framer_test.cc

Issue 2861393005: Partial revert of a spdy_framer_test.cc clean up. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/core/spdy_framer_test.cc
diff --git a/net/spdy/core/spdy_framer_test.cc b/net/spdy/core/spdy_framer_test.cc
index 6e226fa584e31f5bb5508f8b888274d3a09674a3..0f3deff793c25ad0d7d19e70cc51dadce74d99ca 100644
--- a/net/spdy/core/spdy_framer_test.cc
+++ b/net/spdy/core/spdy_framer_test.cc
@@ -410,8 +410,9 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface,
data_frame_count_(0),
last_payload_len_(0),
last_frame_len_(0),
- header_buffer_(kDefaultHeaderBufferSize),
+ header_buffer_(new char[kDefaultHeaderBufferSize]),
header_buffer_length_(0),
+ header_buffer_size_(kDefaultHeaderBufferSize),
header_stream_id_(static_cast<SpdyStreamId>(-1)),
header_control_type_(SpdyFrameType::DATA),
header_buffer_valid_(false) {}
@@ -617,7 +618,7 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface,
DLOG(FATAL) << "Attempted to init header streaming with "
<< "invalid control frame type: " << header_control_type;
}
- std::fill(header_buffer_.begin(), header_buffer_.end(), 0);
+ memset(header_buffer_.get(), 0, header_buffer_size_);
header_buffer_length_ = 0;
header_stream_id_ = stream_id;
header_control_type_ = header_control_type;
@@ -631,7 +632,8 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface,
// Override the default buffer size (16K). Call before using the framer!
void set_header_buffer_size(size_t header_buffer_size) {
- header_buffer_.resize(header_buffer_size);
+ header_buffer_size_ = header_buffer_size;
+ header_buffer_.reset(new char[header_buffer_size]);
}
// Largest control frame that the SPDY implementation sends, including the
@@ -681,8 +683,9 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface,
size_t last_frame_len_;
// Header block streaming state:
- std::vector<char> header_buffer_;
+ std::unique_ptr<char[]> header_buffer_;
size_t header_buffer_length_;
+ size_t header_buffer_size_;
size_t header_bytes_received_;
SpdyStreamId header_stream_id_;
SpdyFrameType header_control_type_;
@@ -3027,7 +3030,7 @@ TEST_P(SpdyFramerTest, ControlFrameMuchTooLarge) {
control_frame.size());
// It's up to the visitor to ignore extraneous header data; the framer
// won't throw an error.
- EXPECT_GT(visitor.header_bytes_received_, visitor.header_buffer_.size());
+ EXPECT_GT(visitor.header_bytes_received_, visitor.header_buffer_size_);
EXPECT_EQ(1, visitor.end_of_stream_count_);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698