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

net/quic/crypto/properties_based_quic_server_info_test.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/quic/crypto/properties_based_quic_server_info.h"
 
 #include <string>
 
 #include "net/base/net_errors.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/quic/quic_server_id.h"
+#include "net/test/gtest_util.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace test {
 
 namespace {
 const char kServerConfigA[] = "server_config_a";
 const char kSourceAddressTokenA[] = "source_address_token_a";
 const char kCertSCTA[] = "cert_sct_a";
 const char kChloHashA[] = "chlo_hash_a";
@@ skipping 45 matching lines @@
 };
 
 // Test persisting, reading and verifying and then updating and verifing.
 TEST_F(PropertiesBasedQuicServerInfoTest, Update) {
   InitializeAndPersist();
 
   // Read the persisted data and verify we have read the data correctly.
   PropertiesBasedQuicServerInfo server_info1(server_id_,
                                              &http_server_properties_);
   server_info1.Start();
-  EXPECT_EQ(OK, server_info1.WaitForDataReady(callback_));  // Read the data.
+  EXPECT_THAT(server_info1.WaitForDataReady(callback_),
+              IsOk());  // Read the data.
   EXPECT_TRUE(server_info1.IsDataReady());
 
   // Verify the data.
   const QuicServerInfo::State& state1 = server_info1.state();
   EXPECT_EQ(1U, state1.certs.size());
   VerifyInitialData(state1);
 
   // Update the data, by adding another cert.
   QuicServerInfo::State* state2 = server_info1.mutable_state();
   state2->certs.push_back(kCertB);
   EXPECT_TRUE(server_info_.IsReadyToPersist());
   server_info1.Persist();
 
   // Read the persisted data and verify we have read the data correctly.
   PropertiesBasedQuicServerInfo server_info2(server_id_,
                                              &http_server_properties_);
   server_info2.Start();
-  EXPECT_EQ(OK, server_info2.WaitForDataReady(callback_));  // Read the data.
+  EXPECT_THAT(server_info2.WaitForDataReady(callback_),
+              IsOk());  // Read the data.
   EXPECT_TRUE(server_info1.IsDataReady());
 
   // Verify updated data.
   const QuicServerInfo::State& state3 = server_info2.state();
   VerifyInitialData(state3);
   EXPECT_EQ(2U, state3.certs.size());
   EXPECT_EQ(kCertB, state3.certs[1]);
 }
 
 }  // namespace test
 }  // namespace net