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

net/cert/multi_threaded_cert_verifier_unittest.cc

Index: net/cert/multi_threaded_cert_verifier_unittest.cc
diff --git a/net/cert/multi_threaded_cert_verifier_unittest.cc b/net/cert/multi_threaded_cert_verifier_unittest.cc
index d57ec06faaec418d366a48625860157fe5e6851e..4d9e50ee8ea8a8d74ce9995fb9a8862e0b0c0194 100644
--- a/net/cert/multi_threaded_cert_verifier_unittest.cc
+++ b/net/cert/multi_threaded_cert_verifier_unittest.cc
@@ -18,9 +18,14 @@
 #include "net/cert/x509_certificate.h"
 #include "net/log/net_log.h"
 #include "net/test/cert_test_util.h"
+#include "net/test/gtest_util.h"
 #include "net/test/test_data_directory.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 {
@@ -84,13 +89,13 @@ TEST_F(MultiThreadedCertVerifierTest, InflightJoin) {
       CertVerifier::RequestParams(test_cert, "www.example.com", 0,
                                   std::string(), CertificateList()),
       NULL, &verify_result, callback.callback(), &request, BoundNetLog());
-  ASSERT_EQ(ERR_IO_PENDING, error);
+  ASSERT_THAT(error, IsError(ERR_IO_PENDING));
   EXPECT_TRUE(request);
   error = verifier_.Verify(
       CertVerifier::RequestParams(test_cert, "www.example.com", 0,
                                   std::string(), CertificateList()),
       NULL, &verify_result2, callback2.callback(), &request2, BoundNetLog());
-  EXPECT_EQ(ERR_IO_PENDING, error);
+  EXPECT_THAT(error, IsError(ERR_IO_PENDING));
   EXPECT_TRUE(request2);
   error = callback.WaitForResult();
   EXPECT_TRUE(IsCertificateError(error));
@@ -115,7 +120,7 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequest) {
       CertVerifier::RequestParams(test_cert, "www.example.com", 0,
                                   std::string(), CertificateList()),
       NULL, &verify_result, base::Bind(&FailTest), &request, BoundNetLog());
-  ASSERT_EQ(ERR_IO_PENDING, error);
+  ASSERT_THAT(error, IsError(ERR_IO_PENDING));
   ASSERT_TRUE(request);
   request.reset();
 
@@ -128,7 +133,7 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequest) {
         CertVerifier::RequestParams(test_cert, "www2.example.com", 0,
                                     std::string(), CertificateList()),
         NULL, &verify_result, callback.callback(), &request, BoundNetLog());
-    ASSERT_EQ(ERR_IO_PENDING, error);
+    ASSERT_THAT(error, IsError(ERR_IO_PENDING));
     EXPECT_TRUE(request);
     error = callback.WaitForResult();
   }
@@ -159,7 +164,7 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequestThenQuit) {
                                     std::string(), CertificateList()),
         NULL, &verify_result, callback.callback(), &request, BoundNetLog());
   }
-  ASSERT_EQ(ERR_IO_PENDING, error);
+  ASSERT_THAT(error, IsError(ERR_IO_PENDING));
   EXPECT_TRUE(request);
   request.reset();
   // Destroy |verifier| by going out of scope.
@@ -199,21 +204,21 @@ TEST_F(MultiThreadedCertVerifierTest, MultipleInflightJoin) {
       CertVerifier::RequestParams(test_cert, domain2, 0, std::string(),
                                   CertificateList()),
       nullptr, &verify_result1, callback1.callback(), &request1, BoundNetLog());
-  ASSERT_EQ(ERR_IO_PENDING, error);
+  ASSERT_THAT(error, IsError(ERR_IO_PENDING));
   EXPECT_TRUE(request1);
 
   error = verifier_.Verify(
       CertVerifier::RequestParams(test_cert, domain2, 0, std::string(),
                                   CertificateList()),
       nullptr, &verify_result2, callback2.callback(), &request2, BoundNetLog());
-  EXPECT_EQ(ERR_IO_PENDING, error);
+  EXPECT_THAT(error, IsError(ERR_IO_PENDING));
   EXPECT_TRUE(request2);
 
   error = verifier_.Verify(
       CertVerifier::RequestParams(test_cert, domain3, 0, std::string(),
                                   CertificateList()),
       nullptr, &verify_result3, callback3.callback(), &request3, BoundNetLog());
-  EXPECT_EQ(ERR_IO_PENDING, error);
+  EXPECT_THAT(error, IsError(ERR_IO_PENDING));
   EXPECT_TRUE(request3);
 
   // Start duplicate requests (which should join to existing jobs).
@@ -221,14 +226,14 @@ TEST_F(MultiThreadedCertVerifierTest, MultipleInflightJoin) {
       CertVerifier::RequestParams(test_cert, domain1, 0, std::string(),
                                   CertificateList()),
       nullptr, &verify_result4, callback4.callback(), &request4, BoundNetLog());
-  EXPECT_EQ(ERR_IO_PENDING, error);
+  EXPECT_THAT(error, IsError(ERR_IO_PENDING));
   EXPECT_TRUE(request4);
 
   error = verifier_.Verify(
       CertVerifier::RequestParams(test_cert, domain2, 0, std::string(),
                                   CertificateList()),
       nullptr, &verify_result5, callback5.callback(), &request5, BoundNetLog());
-  EXPECT_EQ(ERR_IO_PENDING, error);
+  EXPECT_THAT(error, IsError(ERR_IO_PENDING));
   EXPECT_TRUE(request5);
 
   error = callback1.WaitForResult();