| Index: net/http/http_network_transaction_unittest.cc
|
| diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
|
| index 966dab90c8f14c0f23aa93df369e5c006861c729..7ce0b5d01a45643776c4226788c2ad857fa0faf6 100644
|
| --- a/net/http/http_network_transaction_unittest.cc
|
| +++ b/net/http/http_network_transaction_unittest.cc
|
| @@ -9593,6 +9593,24 @@ class CapturingProxyResolver : public ProxyResolver {
|
| DISALLOW_COPY_AND_ASSIGN(CapturingProxyResolver);
|
| };
|
|
|
| +class CapturingProxyResolverFactory : public ProxyResolverFactory {
|
| + public:
|
| + explicit CapturingProxyResolverFactory(CapturingProxyResolver* resolver)
|
| + : ProxyResolverFactory(false), resolver_(resolver) {}
|
| +
|
| + int CreateProxyResolver(
|
| + const scoped_refptr<ProxyResolverScriptData>& pac_script,
|
| + scoped_ptr<ProxyResolver>* resolver,
|
| + const net::CompletionCallback& callback,
|
| + scoped_ptr<Request>* request) override {
|
| + resolver->reset(new ForwardingProxyResolver(resolver_));
|
| + return OK;
|
| + }
|
| +
|
| + private:
|
| + ProxyResolver* resolver_;
|
| +};
|
| +
|
| TEST_P(HttpNetworkTransactionTest,
|
| UseAlternateProtocolForTunneledNpnSpdy) {
|
| session_deps_.use_alternate_protocols = true;
|
| @@ -9606,7 +9624,7 @@ TEST_P(HttpNetworkTransactionTest,
|
| session_deps_.proxy_service.reset(new ProxyService(
|
| new ProxyConfigServiceFixed(proxy_config),
|
| make_scoped_ptr(
|
| - new ForwardingProxyResolverFactory(&capturing_proxy_resolver)),
|
| + new CapturingProxyResolverFactory(&capturing_proxy_resolver)),
|
| NULL));
|
| TestNetLog net_log;
|
| session_deps_.net_log = &net_log;
|
|
|