| Index: net/proxy/proxy_resolver_factory_mojo_unittest.cc
|
| diff --git a/net/proxy/proxy_resolver_factory_mojo_unittest.cc b/net/proxy/proxy_resolver_factory_mojo_unittest.cc
|
| index da9ac3367e5a2aac2f5dc2ccff37693adc685b1b..75b2d2241b7a898e9f38f8a108d3b7c5b49f4b08 100644
|
| --- a/net/proxy/proxy_resolver_factory_mojo_unittest.cc
|
| +++ b/net/proxy/proxy_resolver_factory_mojo_unittest.cc
|
| @@ -14,6 +14,7 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/memory/ptr_util.h"
|
| +#include "base/message_loop/message_loop.h"
|
| #include "base/run_loop.h"
|
| #include "base/stl_util.h"
|
| #include "base/values.h"
|
| @@ -272,7 +273,12 @@ void MockMojoProxyResolver::GetProxyForUrl(
|
| break;
|
| }
|
| case GetProxyForUrlAction::WAIT_FOR_CLIENT_DISCONNECT: {
|
| - ASSERT_FALSE(client.WaitForIncomingResponse());
|
| + base::MessageLoop::ScopedNestableTaskAllower nestable_allower(
|
| + base::MessageLoop::current());
|
| + base::RunLoop run_loop;
|
| + client.set_connection_error_handler(run_loop.QuitClosure());
|
| + run_loop.Run();
|
| + ASSERT_TRUE(client.encountered_error());
|
| break;
|
| }
|
| case GetProxyForUrlAction::MAKE_DNS_REQUEST: {
|
| @@ -435,7 +441,12 @@ void MockMojoProxyResolverFactory::CreateResolver(
|
| break;
|
| }
|
| case CreateProxyResolverAction::WAIT_FOR_CLIENT_DISCONNECT: {
|
| - ASSERT_FALSE(client.WaitForIncomingResponse());
|
| + base::MessageLoop::ScopedNestableTaskAllower nestable_allower(
|
| + base::MessageLoop::current());
|
| + base::RunLoop run_loop;
|
| + client.set_connection_error_handler(run_loop.QuitClosure());
|
| + run_loop.Run();
|
| + ASSERT_TRUE(client.encountered_error());
|
| break;
|
| }
|
| case CreateProxyResolverAction::MAKE_DNS_REQUEST: {
|
|
|