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

net/websockets/websocket_handshake_stream_create_helper_test.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/websockets/websocket_handshake_stream_create_helper.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/socket_test_util.h"
+#include "net/test/gtest_util.h"
 #include "net/websockets/websocket_basic_handshake_stream.h"
 #include "net/websockets/websocket_stream.h"
 #include "net/websockets/websocket_test_util.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
+using net::test::IsOk;
+
 namespace net {
 namespace {
 
 // This class encapsulates the details of creating a mock ClientSocketHandle.
 class MockClientSocketHandleFactory {
  public:
   MockClientSocketHandleFactory()
       : pool_(1, 1, socket_factory_maker_.factory()) {}
 
   // The created socket expects |expect_written| to be written to the socket,
@@ skipping 60 matching lines @@
     // will fail and AddressSanitizer should identify the issue.
     static_cast<WebSocketBasicHandshakeStream*>(handshake.get())
         ->SetWebSocketKeyForTesting("dGhlIHNhbXBsZSBub25jZQ==");
 
     HttpRequestInfo request_info;
     request_info.url = GURL("ws://localhost/");
     request_info.method = "GET";
     request_info.load_flags = LOAD_DISABLE_CACHE;
     int rv = handshake->InitializeStream(
         &request_info, DEFAULT_PRIORITY, BoundNetLog(), CompletionCallback());
-    EXPECT_EQ(OK, rv);
+    EXPECT_THAT(rv, IsOk());
 
     HttpRequestHeaders headers;
     headers.SetHeader("Host", "localhost");
     headers.SetHeader("Connection", "Upgrade");
     headers.SetHeader("Pragma", "no-cache");
     headers.SetHeader("Cache-Control", "no-cache");
     headers.SetHeader("Upgrade", "websocket");
     headers.SetHeader("Origin", kOrigin);
     headers.SetHeader("Sec-WebSocket-Version", "13");
     headers.SetHeader("User-Agent", "");
     headers.SetHeader("Accept-Encoding", "gzip, deflate");
     headers.SetHeader("Accept-Language", "en-us,fr");
 
     HttpResponseInfo response;
     TestCompletionCallback dummy;
 
     rv = handshake->SendRequest(headers, &response, dummy.callback());
 
-    EXPECT_EQ(OK, rv);
+    EXPECT_THAT(rv, IsOk());
 
     rv = handshake->ReadResponseHeaders(dummy.callback());
-    EXPECT_EQ(OK, rv);
+    EXPECT_THAT(rv, IsOk());
     EXPECT_EQ(101, response.headers->response_code());
     EXPECT_TRUE(response.headers->HasHeaderValue("Connection", "Upgrade"));
     EXPECT_TRUE(response.headers->HasHeaderValue("Upgrade", "websocket"));
     return handshake->Upgrade();
   }
 
   MockClientSocketHandleFactory socket_handle_factory_;
   TestConnectDelegate connect_delegate_;
   std::string failure_message_;
 };
@@ skipping 37 matching lines @@
 
   EXPECT_EQ(
       "permessage-deflate;"
       " client_max_window_bits=14; server_max_window_bits=14;"
       " server_no_context_takeover; client_no_context_takeover",
       stream->GetExtensions());
 }
 
 }  // namespace
 }  // namespace net