Remove ProxyResolver::(Cancel)SetPacScript and LegacyProxyResolverFactory.

net/proxy/proxy_resolver_mojo.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/proxy/proxy_resolver_mojo.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 73 matching lines @@
   ~ProxyResolverMojo() override;
 
   // ProxyResolver implementation:
   int GetProxyForURL(const GURL& url,
                      ProxyInfo* results,
                      const net::CompletionCallback& callback,
                      RequestHandle* request,
                      const BoundNetLog& net_log) override;
   void CancelRequest(RequestHandle request) override;
   LoadState GetLoadState(RequestHandle request) const override;
-  void CancelSetPacScript() override;
-  int SetPacScript(const scoped_refptr<ProxyResolverScriptData>& pac_script,
-                   const net::CompletionCallback& callback) override;
 
  private:
   class Job;
 
   // Overridden from mojo::ErrorHandler:
   void OnConnectionError() override;
 
   void RemoveJob(Job* job);
 
   // Connection to the Mojo proxy resolver.
@@ skipping 105 matching lines @@
 void ProxyResolverMojo::Job::LoadStateChanged(int32_t load_state) {
   load_state_ = static_cast<LoadState>(load_state);
 }
 
 ProxyResolverMojo::ProxyResolverMojo(
     interfaces::ProxyResolverPtr resolver_ptr,
     scoped_ptr<interfaces::HostResolver> host_resolver,
     scoped_ptr<mojo::Binding<interfaces::HostResolver>> host_resolver_binding,
     scoped_ptr<base::ScopedClosureRunner> on_delete_callback_runner,
     scoped_ptr<ErrorObserverHolder> error_observer)
-    : ProxyResolver(true),
-      mojo_proxy_resolver_ptr_(resolver_ptr.Pass()),
+    : mojo_proxy_resolver_ptr_(resolver_ptr.Pass()),
       mojo_host_resolver_(host_resolver.Pass()),
       mojo_host_resolver_binding_(host_resolver_binding.Pass()),
       error_observer_(error_observer.Pass()),
       on_delete_callback_runner_(on_delete_callback_runner.Pass()) {
   mojo_proxy_resolver_ptr_.set_error_handler(this);
 }
 
 ProxyResolverMojo::~ProxyResolverMojo() {
   DCHECK(thread_checker_.CalledOnValidThread());
   // All pending requests should have been cancelled.
   DCHECK(pending_jobs_.empty());
 }
 
-void ProxyResolverMojo::CancelSetPacScript() {
-  NOTREACHED();
-}
-
-int ProxyResolverMojo::SetPacScript(
-    const scoped_refptr<ProxyResolverScriptData>& pac_script,
-    const CompletionCallback& callback) {
-  NOTREACHED();
-  return ERR_NOT_IMPLEMENTED;
-}
-
 void ProxyResolverMojo::OnConnectionError() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DVLOG(1) << "ProxyResolverMojo::OnConnectionError";
 
   // Disconnect from the Mojo proxy resolver service.
   mojo_proxy_resolver_ptr_.reset();
 }
 
 void ProxyResolverMojo::RemoveJob(Job* job) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 124 matching lines @@
   DCHECK(request);
   if (pac_script->type() != ProxyResolverScriptData::TYPE_SCRIPT_CONTENTS ||
       pac_script->utf16().empty()) {
     return ERR_PAC_SCRIPT_FAILED;
   }
   request->reset(new Job(this, pac_script, resolver, callback));
   return ERR_IO_PENDING;
 }
 
 }  // namespace net