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

net/proxy/proxy_resolver_perftest.cc

 // Copyright (c) 2012 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 <utility>
 
 #include "base/base_paths.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/test/perf_time_logger.h"
 #include "net/base/net_errors.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_resolver.h"
 #include "net/proxy/proxy_resolver_factory.h"
 #include "net/proxy/proxy_resolver_v8.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
+#include "net/test/gtest_util.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include "net/proxy/proxy_resolver_winhttp.h"
 #elif defined(OS_MACOSX)
 #include "net/proxy/proxy_resolver_mac.h"
 #endif
 
+using net::test::IsOk;
+
 namespace net {
 
 namespace {
 
 // This class holds the URL to use for resolving, and the expected result.
 // We track the expected result in order to make sure the performance
 // test is actually resolving URLs properly, otherwise the perf numbers
 // are meaningless :-)
 struct PacQuery {
   const char* query_url;
@@ skipping 71 matching lines @@
  private:
   void RunTest(const std::string& script_name,
                const PacQuery* queries,
                int queries_len) {
     std::unique_ptr<ProxyResolver> resolver;
     if (!factory_->expects_pac_bytes()) {
       GURL pac_url = test_server_.GetURL(std::string("/") + script_name);
       int rv = factory_->CreateProxyResolver(
           ProxyResolverScriptData::FromURL(pac_url), &resolver,
           CompletionCallback(), nullptr);
-      EXPECT_EQ(OK, rv);
+      EXPECT_THAT(rv, IsOk());
     } else {
       resolver = LoadPacScriptAndCreateResolver(script_name);
     }
     ASSERT_TRUE(resolver);
 
     // Do a query to warm things up. In the case of internal-fetch proxy
     // resolvers, the first resolve will be slow since it has to download
     // the PAC script.
     {
       ProxyInfo proxy_info;
       int result =
           resolver->GetProxyForURL(GURL("http://www.warmup.com"), &proxy_info,
                                    CompletionCallback(), NULL, BoundNetLog());
-      ASSERT_EQ(OK, result);
+      ASSERT_THAT(result, IsOk());
     }
 
     // Start the perf timer.
     std::string perf_test_name = resolver_name_ + "_" + script_name;
     base::PerfTimeLogger timer(perf_test_name.c_str());
 
     for (int i = 0; i < kNumIterations; ++i) {
       // Round-robin between URLs to resolve.
       const PacQuery& query = queries[i % queries_len];
 
       // Resolve.
       ProxyInfo proxy_info;
       int result =
           resolver->GetProxyForURL(GURL(query.query_url), &proxy_info,
                                    CompletionCallback(), NULL, BoundNetLog());
 
       // Check that the result was correct. Note that ToPacString() and
       // ASSERT_EQ() are fast, so they won't skew the results.
-      ASSERT_EQ(OK, result);
+      ASSERT_THAT(result, IsOk());
       ASSERT_EQ(query.expected_result, proxy_info.ToPacString());
     }
 
     // Print how long the test ran for.
     timer.Done();
   }
 
   // Read the PAC script from disk and initialize the proxy resolver with it.
   std::unique_ptr<ProxyResolver> LoadPacScriptAndCreateResolver(
       const std::string& script_name) {
@@ skipping 11 matching lines @@
     // If we can't load the file from disk, something is misconfigured.
     LOG_IF(ERROR, !ok) << "Failed to read file: " << path.value();
     if (!ok)
       return nullptr;
 
     // Load the PAC script into the ProxyResolver.
     std::unique_ptr<ProxyResolver> resolver;
     int rv = factory_->CreateProxyResolver(
         ProxyResolverScriptData::FromUTF8(file_contents), &resolver,
         CompletionCallback(), nullptr);
-    EXPECT_EQ(OK, rv);
+    EXPECT_THAT(rv, IsOk());
     return resolver;
   }
 
   ProxyResolverFactory* factory_;
   std::string resolver_name_;
   EmbeddedTestServer test_server_;
 };
 
 #if defined(OS_WIN)
 TEST(ProxyResolverPerfTest, ProxyResolverWinHttp) {
@@ skipping 82 matching lines @@
 TEST(ProxyResolverPerfTest, ProxyResolverV8) {
   base::MessageLoop message_loop;
   ProxyResolverV8Factory factory;
   PacPerfSuiteRunner runner(&factory, "ProxyResolverV8");
   runner.RunAllTests();
 }
 
 }  // namespace
 
 }  // namespace net