| Index: net/spdy/spdy_read_queue_unittest.cc
|
| diff --git a/net/spdy/spdy_read_queue_unittest.cc b/net/spdy/spdy_read_queue_unittest.cc
|
| index a211af11a91d135099846a036229dc5e18bf9954..935694b7b85ddb43983754595c1263b3956cb7c5 100644
|
| --- a/net/spdy/spdy_read_queue_unittest.cc
|
| +++ b/net/spdy/spdy_read_queue_unittest.cc
|
| @@ -7,11 +7,11 @@
|
| #include <algorithm>
|
| #include <cstddef>
|
| #include <memory>
|
| -#include <string>
|
|
|
| #include "base/bind.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "base/stl_util.h"
|
| +#include "net/spdy/platform/api/spdy_string.h"
|
| #include "net/spdy/spdy_buffer.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -24,7 +24,7 @@ const size_t kDataSize = arraysize(kData);
|
|
|
| // Enqueues |data| onto |queue| in chunks of at most |max_buffer_size|
|
| // bytes.
|
| -void EnqueueString(const std::string& data,
|
| +void EnqueueString(const SpdyString& data,
|
| size_t max_buffer_size,
|
| SpdyReadQueue* queue) {
|
| ASSERT_GT(data.size(), 0u);
|
| @@ -42,8 +42,8 @@ void EnqueueString(const std::string& data,
|
|
|
| // Dequeues all bytes in |queue| in chunks of at most
|
| // |max_buffer_size| bytes and returns the data as a string.
|
| -std::string DrainToString(size_t max_buffer_size, SpdyReadQueue* queue) {
|
| - std::string data;
|
| +SpdyString DrainToString(size_t max_buffer_size, SpdyReadQueue* queue) {
|
| + SpdyString data;
|
|
|
| // Pad the buffer so we can detect out-of-bound writes.
|
| size_t padding = std::max(static_cast<size_t>(4096), queue->GetTotalSize());
|
| @@ -78,10 +78,10 @@ std::string DrainToString(size_t max_buffer_size, SpdyReadQueue* queue) {
|
| // sizes.
|
| void RunEnqueueDequeueTest(size_t enqueue_max_buffer_size,
|
| size_t dequeue_max_buffer_size) {
|
| - std::string data(kData, kDataSize);
|
| + SpdyString data(kData, kDataSize);
|
| SpdyReadQueue read_queue;
|
| EnqueueString(data, enqueue_max_buffer_size, &read_queue);
|
| - const std::string& drained_data =
|
| + const SpdyString& drained_data =
|
| DrainToString(dequeue_max_buffer_size, &read_queue);
|
| EXPECT_EQ(data, drained_data);
|
| }
|
|
|