| Index: net/proxy/proxy_resolver_mojo_unittest.cc
|
| diff --git a/net/proxy/proxy_resolver_mojo_unittest.cc b/net/proxy/proxy_resolver_mojo_unittest.cc
|
| index 62f87ec23c018cce72dd364e2616288b71d98689..49c2bf1989bed2bc9adf0e10982ee784b40765ff 100644
|
| --- a/net/proxy/proxy_resolver_mojo_unittest.cc
|
| +++ b/net/proxy/proxy_resolver_mojo_unittest.cc
|
| @@ -22,6 +22,7 @@
|
| #include "net/proxy/mojo_proxy_resolver_factory.h"
|
| #include "net/proxy/mojo_proxy_type_converters.h"
|
| #include "net/proxy/proxy_info.h"
|
| +#include "net/proxy/proxy_resolver_error_observer.h"
|
| #include "net/proxy/proxy_resolver_script_data.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
|
| @@ -259,7 +260,8 @@ class TestMojoProxyResolverFactory : public MojoProxyResolverFactory {
|
|
|
| // Overridden from MojoProxyResolverFactory:
|
| void Create(mojo::InterfaceRequest<interfaces::ProxyResolver> req,
|
| - interfaces::HostResolverPtr host_resolver) override;
|
| + interfaces::HostResolverPtr host_resolver,
|
| + interfaces::ProxyResolverErrorObserverPtr error_handler) override;
|
|
|
| MockMojoProxyResolver& GetMockResolver() { return *mock_proxy_resolver_; }
|
|
|
| @@ -287,7 +289,8 @@ TestMojoProxyResolverFactory::~TestMojoProxyResolverFactory() {
|
|
|
| void TestMojoProxyResolverFactory::Create(
|
| mojo::InterfaceRequest<interfaces::ProxyResolver> req,
|
| - interfaces::HostResolverPtr host_resolver) {
|
| + interfaces::HostResolverPtr host_resolver,
|
| + interfaces::ProxyResolverErrorObserverPtr error_handler) {
|
| if (fail_next_create_) {
|
| req = nullptr;
|
| fail_next_create_ = false;
|
| @@ -362,7 +365,7 @@ class ProxyResolverMojoTest : public testing::Test {
|
| public:
|
| void SetUp() override {
|
| proxy_resolver_mojo_.reset(new ProxyResolverMojo(
|
| - &mojo_proxy_resolver_factory_, &mock_host_resolver_));
|
| + &mojo_proxy_resolver_factory_, &mock_host_resolver_, nullptr));
|
| }
|
|
|
| scoped_ptr<Request> MakeRequest(const GURL& url) {
|
|
|