| Index: net/spdy/hpack/hpack_output_stream.cc
|
| diff --git a/net/spdy/hpack/hpack_output_stream.cc b/net/spdy/hpack/hpack_output_stream.cc
|
| index 86f0f5bfcd825813383f501d96647adfb7fdfd5d..c3673cb27e1501f0a23468590cdaa9cdda581e4d 100644
|
| --- a/net/spdy/hpack/hpack_output_stream.cc
|
| +++ b/net/spdy/hpack/hpack_output_stream.cc
|
| @@ -11,8 +11,6 @@
|
|
|
| namespace net {
|
|
|
| -using std::string;
|
| -
|
| HpackOutputStream::HpackOutputStream() : bit_offset_(0) {}
|
|
|
| HpackOutputStream::~HpackOutputStream() {}
|
| @@ -65,7 +63,7 @@ void HpackOutputStream::AppendUint32(uint32_t I) {
|
| }
|
| }
|
|
|
| -void HpackOutputStream::TakeString(string* output) {
|
| +void HpackOutputStream::TakeString(SpdyString* output) {
|
| // This must hold, since all public functions cause the buffer to
|
| // end on a byte boundary.
|
| DCHECK_EQ(bit_offset_, 0u);
|
| @@ -74,10 +72,10 @@ void HpackOutputStream::TakeString(string* output) {
|
| bit_offset_ = 0;
|
| }
|
|
|
| -void HpackOutputStream::BoundedTakeString(size_t max_size, string* output) {
|
| +void HpackOutputStream::BoundedTakeString(size_t max_size, SpdyString* output) {
|
| if (buffer_.size() > max_size) {
|
| // Save off overflow bytes to temporary string (causes a copy).
|
| - string overflow(buffer_.data() + max_size, buffer_.size() - max_size);
|
| + SpdyString overflow(buffer_.data() + max_size, buffer_.size() - max_size);
|
|
|
| // Resize buffer down to the given limit.
|
| buffer_.resize(max_size);
|
|
|