| Index: net/proxy/proxy_resolver_winhttp.cc
|
| diff --git a/net/proxy/proxy_resolver_winhttp.cc b/net/proxy/proxy_resolver_winhttp.cc
|
| index f7193d16a5f2ec4865caa8d934820a42742007e6..193fd988118cae3fbb8920a100a7250fb8c58e2a 100644
|
| --- a/net/proxy/proxy_resolver_winhttp.cc
|
| +++ b/net/proxy/proxy_resolver_winhttp.cc
|
| @@ -46,11 +46,6 @@ class ProxyResolverWinHttp : public ProxyResolver {
|
|
|
| LoadState GetLoadState(RequestHandle request) const override;
|
|
|
| - void CancelSetPacScript() override;
|
| -
|
| - int SetPacScript(const scoped_refptr<ProxyResolverScriptData>& script_data,
|
| - const CompletionCallback& /*callback*/) override;
|
| -
|
| private:
|
| bool OpenWinHttpSession();
|
| void CloseWinHttpSession();
|
| @@ -65,8 +60,7 @@ class ProxyResolverWinHttp : public ProxyResolver {
|
|
|
| ProxyResolverWinHttp::ProxyResolverWinHttp(
|
| const scoped_refptr<ProxyResolverScriptData>& script_data)
|
| - : ProxyResolver(false /*expects_pac_bytes*/),
|
| - session_handle_(NULL),
|
| + : session_handle_(NULL),
|
| pac_url_(script_data->type() == ProxyResolverScriptData::TYPE_AUTO_DETECT
|
| ? GURL("http://wpad/wpad.dat")
|
| : script_data->url()) {
|
| @@ -169,17 +163,6 @@ LoadState ProxyResolverWinHttp::GetLoadState(RequestHandle request) const {
|
| return LOAD_STATE_IDLE;
|
| }
|
|
|
| -void ProxyResolverWinHttp::CancelSetPacScript() {
|
| - NOTREACHED();
|
| -}
|
| -
|
| -int ProxyResolverWinHttp::SetPacScript(
|
| - const scoped_refptr<ProxyResolverScriptData>& script_data,
|
| - const CompletionCallback& /*callback*/) {
|
| - NOTREACHED();
|
| - return ERR_NOT_IMPLEMENTED;
|
| -}
|
| -
|
| bool ProxyResolverWinHttp::OpenWinHttpSession() {
|
| DCHECK(!session_handle_);
|
| session_handle_ = WinHttpOpen(NULL,
|
|
|