| Index: net/server/http_server_unittest.cc
|
| diff --git a/net/server/http_server_unittest.cc b/net/server/http_server_unittest.cc
|
| index aebe5938018c2166be5b1e5dbc10901d3d99c044..09b6bf4c11f9c2daf57350ab37f4e266ee10a1d5 100644
|
| --- a/net/server/http_server_unittest.cc
|
| +++ b/net/server/http_server_unittest.cc
|
| @@ -270,9 +270,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(
|
| + base::StartsWithASCII(GetRequest(0).peer.ToString(), "127.0.0.1", true));
|
| }
|
|
|
| TEST_F(HttpServerTest, RequestWithHeaders) {
|
| @@ -443,7 +442,7 @@ TEST_F(HttpServerTest, Send200) {
|
|
|
| std::string response;
|
| ASSERT_TRUE(client.ReadResponse(&response));
|
| - ASSERT_TRUE(StartsWithASCII(response, "HTTP/1.1 200 OK", true));
|
| + ASSERT_TRUE(base::StartsWithASCII(response, "HTTP/1.1 200 OK", true));
|
| ASSERT_TRUE(EndsWith(response, "Response!", true));
|
| }
|
|
|
| @@ -592,7 +591,7 @@ TEST_F(HttpServerTest, MultipleRequestsOnSameConnection) {
|
| server_->Send200(client_connection_id, "Content for /test", "text/plain");
|
| std::string response1;
|
| ASSERT_TRUE(client.ReadResponse(&response1));
|
| - ASSERT_TRUE(StartsWithASCII(response1, "HTTP/1.1 200 OK", true));
|
| + ASSERT_TRUE(base::StartsWithASCII(response1, "HTTP/1.1 200 OK", true));
|
| ASSERT_TRUE(EndsWith(response1, "Content for /test", true));
|
|
|
| client.Send("GET /test2 HTTP/1.1\r\n\r\n");
|
| @@ -603,7 +602,7 @@ TEST_F(HttpServerTest, MultipleRequestsOnSameConnection) {
|
| server_->Send404(client_connection_id);
|
| std::string response2;
|
| ASSERT_TRUE(client.ReadResponse(&response2));
|
| - ASSERT_TRUE(StartsWithASCII(response2, "HTTP/1.1 404 Not Found", true));
|
| + ASSERT_TRUE(base::StartsWithASCII(response2, "HTTP/1.1 404 Not Found", true));
|
|
|
| client.Send("GET /test3 HTTP/1.1\r\n\r\n");
|
| ASSERT_TRUE(RunUntilRequestsReceived(3));
|
| @@ -613,7 +612,7 @@ TEST_F(HttpServerTest, MultipleRequestsOnSameConnection) {
|
| server_->Send200(client_connection_id, "Content for /test3", "text/plain");
|
| std::string response3;
|
| ASSERT_TRUE(client.ReadResponse(&response3));
|
| - ASSERT_TRUE(StartsWithASCII(response3, "HTTP/1.1 200 OK", true));
|
| + ASSERT_TRUE(base::StartsWithASCII(response3, "HTTP/1.1 200 OK", true));
|
| ASSERT_TRUE(EndsWith(response3, "Content for /test3", true));
|
| }
|
|
|
|
|