| Index: net/server/http_server_unittest.cc
|
| diff --git a/net/server/http_server_unittest.cc b/net/server/http_server_unittest.cc
|
| index de8690f138e05608447ffe718c878a186fd0d4cd..4d5aa6d7b451ed22f3612d10845bc62631b50c69 100644
|
| --- a/net/server/http_server_unittest.cc
|
| +++ b/net/server/http_server_unittest.cc
|
| @@ -90,9 +90,7 @@ class TestHttpClient {
|
| Write();
|
| }
|
|
|
| - bool Read(std::string* message) {
|
| - return Read(message, 1);
|
| - }
|
| + bool Read(std::string* message) { return Read(message, 1); }
|
|
|
| bool Read(std::string* message, int expected_bytes) {
|
| int total_bytes_received = 0;
|
| @@ -134,9 +132,8 @@ class TestHttpClient {
|
|
|
| void ReadInternal(const net::CompletionCallback& callback) {
|
| read_buffer_ = new IOBufferWithSize(kMaxExpectedResponseLength);
|
| - int result = socket_->Read(read_buffer_,
|
| - kMaxExpectedResponseLength,
|
| - callback);
|
| + int result =
|
| + socket_->Read(read_buffer_, kMaxExpectedResponseLength, callback);
|
| if (result != ERR_IO_PENDING)
|
| callback.Run(result);
|
| }
|
| @@ -149,8 +146,7 @@ class TestHttpClient {
|
|
|
| } // namespace
|
|
|
| -class HttpServerTest : public testing::Test,
|
| - public HttpServer::Delegate {
|
| +class HttpServerTest : public testing::Test, public HttpServer::Delegate {
|
| public:
|
| HttpServerTest() : quit_after_request_count_(0) {}
|
|
|
| @@ -218,9 +214,8 @@ TEST_F(HttpServerTest, Request) {
|
| ASSERT_EQ("/test", GetRequest(0).path);
|
| ASSERT_EQ("", GetRequest(0).data);
|
| ASSERT_EQ(0u, GetRequest(0).headers.size());
|
| - ASSERT_TRUE(StartsWithASCII(GetRequest(0).peer.ToString(),
|
| - "127.0.0.1",
|
| - true));
|
| + ASSERT_TRUE(
|
| + StartsWithASCII(GetRequest(0).peer.ToString(), "127.0.0.1", true));
|
| }
|
|
|
| TEST_F(HttpServerTest, RequestWithHeaders) {
|
| @@ -349,8 +344,7 @@ class MockStreamListenSocket : public StreamListenSocket {
|
| } // namespace
|
|
|
| TEST_F(HttpServerTest, RequestWithBodySplitAcrossPackets) {
|
| - StreamListenSocket* socket =
|
| - new MockStreamListenSocket(server_.get());
|
| + StreamListenSocket* socket = new MockStreamListenSocket(server_.get());
|
| server_->DidAccept(NULL, make_scoped_ptr(socket));
|
| std::string body("body");
|
| std::string request_text = base::StringPrintf(
|
|
|