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

net/dns/mojo_host_resolver_impl_unittest.cc

 // Copyright 2015 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/dns/mojo_host_resolver_impl.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "net/base/address_list.h"
 #include "net/base/net_errors.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/dns/mojo_host_type_converters.h"
 #include "net/log/net_log.h"
+#include "net/test/gtest_util.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using net::test::IsError;
+using net::test::IsOk;
+
 namespace net {
 
 namespace {
 
 class TestRequestClient : public interfaces::HostResolverRequestClient {
  public:
   explicit TestRequestClient(
       mojo::InterfaceRequest<interfaces::HostResolverRequestClient> req)
       : done_(false), binding_(this, std::move(req)) {
     binding_.set_connection_error_handler(base::Bind(
@@ skipping 130 matching lines @@
 
 TEST_F(MojoHostResolverImplTest, Resolve) {
   interfaces::HostResolverRequestClientPtr client_ptr;
   TestRequestClient client(mojo::GetProxy(&client_ptr));
 
   interfaces::HostResolverRequestInfoPtr request =
       CreateRequest("example.com", 80, false);
   resolver_service_->Resolve(std::move(request), std::move(client_ptr));
   client.WaitForResult();
 
-  EXPECT_EQ(net::OK, client.error_);
+  EXPECT_THAT(client.error_, IsOk());
   AddressList address_list = (*client.results_).To<AddressList>();
   EXPECT_EQ(1U, address_list.size());
   EXPECT_EQ("1.2.3.4:80", address_list[0].ToString());
 }
 
 TEST_F(MojoHostResolverImplTest, ResolveSynchronous) {
   interfaces::HostResolverRequestClientPtr client_ptr;
   TestRequestClient client(mojo::GetProxy(&client_ptr));
 
   mock_host_resolver_.set_synchronous_mode(true);
 
   interfaces::HostResolverRequestInfoPtr request =
       CreateRequest("example.com", 80, false);
   resolver_service_->Resolve(std::move(request), std::move(client_ptr));
   client.WaitForResult();
 
-  EXPECT_EQ(net::OK, client.error_);
+  EXPECT_THAT(client.error_, IsOk());
   AddressList address_list = (*client.results_).To<AddressList>();
   EXPECT_EQ(1U, address_list.size());
   EXPECT_EQ("1.2.3.4:80", address_list[0].ToString());
 }
 
 TEST_F(MojoHostResolverImplTest, ResolveMultiple) {
   interfaces::HostResolverRequestClientPtr client1_ptr;
   TestRequestClient client1(mojo::GetProxy(&client1_ptr));
   interfaces::HostResolverRequestClientPtr client2_ptr;
   TestRequestClient client2(mojo::GetProxy(&client2_ptr));
 
   mock_host_resolver_.set_ondemand_mode(true);
 
   interfaces::HostResolverRequestInfoPtr request1 =
       CreateRequest("example.com", 80, false);
   resolver_service_->Resolve(std::move(request1), std::move(client1_ptr));
   interfaces::HostResolverRequestInfoPtr request2 =
       CreateRequest("chromium.org", 80, false);
   resolver_service_->Resolve(std::move(request2), std::move(client2_ptr));
   WaitForRequests(2);
   mock_host_resolver_.ResolveAllPending();
 
   client1.WaitForResult();
   client2.WaitForResult();
 
-  EXPECT_EQ(net::OK, client1.error_);
+  EXPECT_THAT(client1.error_, IsOk());
   AddressList address_list = (*client1.results_).To<AddressList>();
   EXPECT_EQ(1U, address_list.size());
   EXPECT_EQ("1.2.3.4:80", address_list[0].ToString());
-  EXPECT_EQ(net::OK, client2.error_);
+  EXPECT_THAT(client2.error_, IsOk());
   address_list = (*client2.results_).To<AddressList>();
   EXPECT_EQ(1U, address_list.size());
   EXPECT_EQ("8.8.8.8:80", address_list[0].ToString());
 }
 
 TEST_F(MojoHostResolverImplTest, ResolveDuplicate) {
   interfaces::HostResolverRequestClientPtr client1_ptr;
   TestRequestClient client1(mojo::GetProxy(&client1_ptr));
   interfaces::HostResolverRequestClientPtr client2_ptr;
   TestRequestClient client2(mojo::GetProxy(&client2_ptr));
 
   mock_host_resolver_.set_ondemand_mode(true);
 
   interfaces::HostResolverRequestInfoPtr request1 =
       CreateRequest("example.com", 80, false);
   resolver_service_->Resolve(std::move(request1), std::move(client1_ptr));
   interfaces::HostResolverRequestInfoPtr request2 =
       CreateRequest("example.com", 80, false);
   resolver_service_->Resolve(std::move(request2), std::move(client2_ptr));
   WaitForRequests(2);
   mock_host_resolver_.ResolveAllPending();
 
   client1.WaitForResult();
   client2.WaitForResult();
 
-  EXPECT_EQ(net::OK, client1.error_);
+  EXPECT_THAT(client1.error_, IsOk());
   AddressList address_list = (*client1.results_).To<AddressList>();
   EXPECT_EQ(1U, address_list.size());
   EXPECT_EQ("1.2.3.4:80", address_list[0].ToString());
-  EXPECT_EQ(net::OK, client2.error_);
+  EXPECT_THAT(client2.error_, IsOk());
   address_list = (*client2.results_).To<AddressList>();
   EXPECT_EQ(1U, address_list.size());
   EXPECT_EQ("1.2.3.4:80", address_list[0].ToString());
 }
 
 TEST_F(MojoHostResolverImplTest, ResolveFailure) {
   interfaces::HostResolverRequestClientPtr client_ptr;
   TestRequestClient client(mojo::GetProxy(&client_ptr));
 
   interfaces::HostResolverRequestInfoPtr request =
       CreateRequest("failure.fail", 80, false);
   resolver_service_->Resolve(std::move(request), std::move(client_ptr));
   client.WaitForResult();
 
-  EXPECT_EQ(net::ERR_NAME_NOT_RESOLVED, client.error_);
+  EXPECT_THAT(client.error_, IsError(net::ERR_NAME_NOT_RESOLVED));
   EXPECT_TRUE(client.results_.is_null());
 }
 
 TEST_F(MojoHostResolverImplTest, DestroyClient) {
   interfaces::HostResolverRequestClientPtr client_ptr;
   std::unique_ptr<TestRequestClient> client(
       new TestRequestClient(mojo::GetProxy(&client_ptr)));
 
   mock_host_resolver_.set_ondemand_mode(true);
 
   interfaces::HostResolverRequestInfoPtr request =
       CreateRequest("example.com", 80, false);
   resolver_service_->Resolve(std::move(request), std::move(client_ptr));
   WaitForRequests(1);
 
   client.reset();
   base::RunLoop().RunUntilIdle();
 
   mock_host_resolver_.ResolveAllPending();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace net