| Index: net/proxy/in_process_mojo_proxy_resolver_factory.h
|
| diff --git a/net/proxy/in_process_mojo_proxy_resolver_factory.h b/net/proxy/in_process_mojo_proxy_resolver_factory.h
|
| index 232d2376e6ac478592b1af1a0bfb66507f62fd00..8794614f702ec855ca63b5deffdc56101fd1c2d4 100644
|
| --- a/net/proxy/in_process_mojo_proxy_resolver_factory.h
|
| +++ b/net/proxy/in_process_mojo_proxy_resolver_factory.h
|
| @@ -6,7 +6,7 @@
|
| #define NET_PROXY_IN_PROCESS_MOJO_PROXY_RESOLVER_FACTORY_H_
|
|
|
| #include "base/macros.h"
|
| -#include "net/interfaces/proxy_resolver_service.mojom.h"
|
| +#include "net/proxy/mojo_proxy_resolver_factory.h"
|
|
|
| template <typename T>
|
| struct DefaultSingletonTraits;
|
| @@ -16,13 +16,12 @@ namespace net {
|
| // Factory to connect to an in-process Mojo proxy resolver service.
|
| // NOTE: This is intended to be temporary for debugging purposes and will be
|
| // removed when we're confident with the out-of-process implementation.
|
| -class InProcessMojoProxyResolverFactory
|
| - : public interfaces::ProxyResolverFactory {
|
| +class InProcessMojoProxyResolverFactory : public MojoProxyResolverFactory {
|
| public:
|
| static InProcessMojoProxyResolverFactory* GetInstance();
|
|
|
| - // Overridden from interfaces::ProxyResolverFactory:
|
| - void CreateResolver(
|
| + // Overridden from MojoProxyResolverFactory:
|
| + scoped_ptr<base::ScopedClosureRunner> CreateResolver(
|
| const mojo::String& pac_script,
|
| mojo::InterfaceRequest<interfaces::ProxyResolver> req,
|
| interfaces::HostResolverPtr host_resolver,
|
|
|