Refactor net tests to use GMock matchers for checking net::Error results

net/server/http_server_unittest.cc

Index: net/server/http_server_unittest.cc
diff --git a/net/server/http_server_unittest.cc b/net/server/http_server_unittest.cc
index 2f573cf29c12b6f0c9e7905250a74076d7ca260d..03544f12b3d5f82a90c83ab5d8a0ba1cfbf2d4d7 100644
--- a/net/server/http_server_unittest.cc
+++ b/net/server/http_server_unittest.cc
@@ -40,13 +40,17 @@
 #include "net/server/http_server_request_info.h"
 #include "net/socket/tcp_client_socket.h"
 #include "net/socket/tcp_server_socket.h"
+#include "net/test/gtest_util.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_test_util.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using net::test::IsOk;
+
 namespace net {
 
 namespace {
@@ -191,7 +195,7 @@ class HttpServerTest : public testing::Test,
         new TCPServerSocket(NULL, NetLog::Source()));
     server_socket->ListenWithAddressAndPort("127.0.0.1", 0, 1);
     server_.reset(new HttpServer(std::move(server_socket), this));
-    ASSERT_EQ(OK, server_->GetLocalAddress(&server_address_));
+    ASSERT_THAT(server_->GetLocalAddress(&server_address_), IsOk());
   }
 
   void OnConnect(int connection_id) override {}
@@ -268,7 +272,7 @@ class WebSocketTest : public HttpServerTest {
 
 TEST_F(HttpServerTest, Request) {
   TestHttpClient client;
-  ASSERT_EQ(OK, client.ConnectAndWait(server_address_));
+  ASSERT_THAT(client.ConnectAndWait(server_address_), IsOk());
   client.Send("GET /test HTTP/1.1\r\n\r\n");
   ASSERT_TRUE(RunUntilRequestsReceived(1));
   ASSERT_EQ("GET", GetRequest(0).method);
@@ -281,7 +285,7 @@ TEST_F(HttpServerTest, Request) {
 
 TEST_F(HttpServerTest, RequestWithHeaders) {
   TestHttpClient client;
-  ASSERT_EQ(OK, client.ConnectAndWait(server_address_));
+  ASSERT_THAT(client.ConnectAndWait(server_address_), IsOk());
   const char* const kHeaders[][3] = {
       {"Header", ": ", "1"},
       {"HeaderWithNoWhitespace", ":", "1"},
@@ -311,7 +315,7 @@ TEST_F(HttpServerTest, RequestWithHeaders) {
 
 TEST_F(HttpServerTest, RequestWithDuplicateHeaders) {
   TestHttpClient client;
-  ASSERT_EQ(OK, client.ConnectAndWait(server_address_));
+  ASSERT_THAT(client.ConnectAndWait(server_address_), IsOk());
   const char* const kHeaders[][3] = {
       {"FirstHeader", ": ", "1"},
       {"DuplicateHeader", ": ", "2"},
@@ -339,7 +343,7 @@ TEST_F(HttpServerTest, RequestWithDuplicateHeaders) {
 
 TEST_F(HttpServerTest, HasHeaderValueTest) {
   TestHttpClient client;
-  ASSERT_EQ(OK, client.ConnectAndWait(server_address_));
+  ASSERT_THAT(client.ConnectAndWait(server_address_), IsOk());
   const char* const kHeaders[] = {
       "Header: Abcd",
       "HeaderWithNoWhitespace:E",
@@ -376,7 +380,7 @@ TEST_F(HttpServerTest, HasHeaderValueTest) {
 
 TEST_F(HttpServerTest, RequestWithBody) {
   TestHttpClient client;
-  ASSERT_EQ(OK, client.ConnectAndWait(server_address_));
+  ASSERT_THAT(client.ConnectAndWait(server_address_), IsOk());
   std::string body = "a" + std::string(1 << 10, 'b') + "c";
   client.Send(base::StringPrintf(
       "GET /test HTTP/1.1\r\n"
@@ -393,7 +397,7 @@ TEST_F(HttpServerTest, RequestWithBody) {
 
 TEST_F(WebSocketTest, RequestWebSocket) {
   TestHttpClient client;
-  ASSERT_EQ(OK, client.ConnectAndWait(server_address_));
+  ASSERT_THAT(client.ConnectAndWait(server_address_), IsOk());
   client.Send(
       "GET /test HTTP/1.1\r\n"
       "Upgrade: WebSocket\r\n"
@@ -440,7 +444,7 @@ TEST_F(HttpServerTest, RequestWithTooLargeBody) {
 
 TEST_F(HttpServerTest, Send200) {
   TestHttpClient client;
-  ASSERT_EQ(OK, client.ConnectAndWait(server_address_));
+  ASSERT_THAT(client.ConnectAndWait(server_address_), IsOk());
   client.Send("GET /test HTTP/1.1\r\n\r\n");
   ASSERT_TRUE(RunUntilRequestsReceived(1));
   server_->Send200(GetConnectionId(0), "Response!", "text/plain");
@@ -455,7 +459,7 @@ TEST_F(HttpServerTest, Send200) {
 
 TEST_F(HttpServerTest, SendRaw) {
   TestHttpClient client;
-  ASSERT_EQ(OK, client.ConnectAndWait(server_address_));
+  ASSERT_THAT(client.ConnectAndWait(server_address_), IsOk());
   client.Send("GET /test HTTP/1.1\r\n\r\n");
   ASSERT_TRUE(RunUntilRequestsReceived(1));
   server_->SendRaw(GetConnectionId(0), "Raw Data ");
@@ -589,7 +593,7 @@ TEST_F(HttpServerTest, MultipleRequestsOnSameConnection) {
   // The idea behind this test is that requests with or without bodies should
   // not break parsing of the next request.
   TestHttpClient client;
-  ASSERT_EQ(OK, client.ConnectAndWait(server_address_));
+  ASSERT_THAT(client.ConnectAndWait(server_address_), IsOk());
   std::string body = "body";
   client.Send(base::StringPrintf(
       "GET /test HTTP/1.1\r\n"
@@ -646,7 +650,7 @@ class CloseOnConnectHttpServerTest : public HttpServerTest {
 
 TEST_F(CloseOnConnectHttpServerTest, ServerImmediatelyClosesConnection) {
   TestHttpClient client;
-  ASSERT_EQ(OK, client.ConnectAndWait(server_address_));
+  ASSERT_THAT(client.ConnectAndWait(server_address_), IsOk());
   client.Send("GET / HTTP/1.1\r\n\r\n");
   ASSERT_FALSE(RunUntilRequestsReceived(1));
   ASSERT_EQ(1ul, connection_ids_.size());