| Index: net/proxy/mojo_proxy_resolver_impl_unittest.cc
|
| diff --git a/net/proxy/mojo_proxy_resolver_impl_unittest.cc b/net/proxy/mojo_proxy_resolver_impl_unittest.cc
|
| index e6484449624819b7e04eb1b055605f5edce63b53..277374bea43be3e429c1b3c30b373e06ab1571be 100644
|
| --- a/net/proxy/mojo_proxy_resolver_impl_unittest.cc
|
| +++ b/net/proxy/mojo_proxy_resolver_impl_unittest.cc
|
| @@ -17,8 +17,13 @@
|
| #include "net/proxy/proxy_resolver_v8_tracing.h"
|
| #include "net/proxy/proxy_server.h"
|
| #include "net/test/event_waiter.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 {
|
|
|
| @@ -208,7 +213,7 @@ TEST_F(MojoProxyResolverImplTest, GetProxyForUrl) {
|
| request.callback.Run(OK);
|
| client.WaitForResult();
|
|
|
| - EXPECT_EQ(OK, client.error());
|
| + EXPECT_THAT(client.error(), IsOk());
|
| std::vector<ProxyServer> servers =
|
| client.results().To<std::vector<ProxyServer>>();
|
| ASSERT_EQ(6u, servers.size());
|
| @@ -247,7 +252,7 @@ TEST_F(MojoProxyResolverImplTest, GetProxyForUrlFailure) {
|
| request.callback.Run(ERR_FAILED);
|
| client.WaitForResult();
|
|
|
| - EXPECT_EQ(ERR_FAILED, client.error());
|
| + EXPECT_THAT(client.error(), IsError(ERR_FAILED));
|
| std::vector<ProxyServer> proxy_servers =
|
| client.results().To<std::vector<ProxyServer>>();
|
| EXPECT_TRUE(proxy_servers.empty());
|
| @@ -276,7 +281,7 @@ TEST_F(MojoProxyResolverImplTest, GetProxyForUrlMultiple) {
|
| client1.WaitForResult();
|
| client2.WaitForResult();
|
|
|
| - EXPECT_EQ(OK, client1.error());
|
| + EXPECT_THAT(client1.error(), IsOk());
|
| std::vector<ProxyServer> proxy_servers1 =
|
| client1.results().To<std::vector<ProxyServer>>();
|
| ASSERT_EQ(1u, proxy_servers1.size());
|
| @@ -285,7 +290,7 @@ TEST_F(MojoProxyResolverImplTest, GetProxyForUrlMultiple) {
|
| EXPECT_EQ("proxy.example.com", server1.host_port_pair().host());
|
| EXPECT_EQ(12345, server1.host_port_pair().port());
|
|
|
| - EXPECT_EQ(OK, client2.error());
|
| + EXPECT_THAT(client2.error(), IsOk());
|
| std::vector<ProxyServer> proxy_servers2 =
|
| client2.results().To<std::vector<ProxyServer>>();
|
| ASSERT_EQ(1u, proxy_servers1.size());
|
|
|