Remove ProxyResolver::(Cancel)SetPacScript and LegacyProxyResolverFactory.

net/proxy/proxy_resolver_factory.cc

Index: net/proxy/proxy_resolver_factory.cc
diff --git a/net/proxy/proxy_resolver_factory.cc b/net/proxy/proxy_resolver_factory.cc
index b544d892ac7e682c860743ed1a15f7484efe6ee2..fc7173e96bddedcc908b5ed680d5543cb0c59fb3 100644
--- a/net/proxy/proxy_resolver_factory.cc
+++ b/net/proxy/proxy_resolver_factory.cc
@@ -9,78 +9,6 @@
 
 namespace net {
 
-class LegacyProxyResolverFactory::Job : public ProxyResolverFactory::Request {
- public:
-  Job(LegacyProxyResolverFactory* factory,
-      const scoped_refptr<ProxyResolverScriptData>& pac_script,
-      scoped_ptr<ProxyResolver> resolver,
-      scoped_ptr<ProxyResolver>* resolver_out,
-      const net::CompletionCallback& callback);
-  ~Job() override;
-  int Start();
-
-  void FactoryDestroyed();
-
- private:
-  void OnSetPacScriptDone(int error);
-
-  LegacyProxyResolverFactory* factory_;
-  const scoped_refptr<ProxyResolverScriptData> pac_script_;
-  scoped_ptr<ProxyResolver> resolver_;
-  scoped_ptr<ProxyResolver>* resolver_out_;
-  const net::CompletionCallback callback_;
-};
-
-LegacyProxyResolverFactory::Job::Job(
-    LegacyProxyResolverFactory* factory,
-    const scoped_refptr<ProxyResolverScriptData>& pac_script,
-    scoped_ptr<ProxyResolver> resolver,
-    scoped_ptr<ProxyResolver>* resolver_out,
-    const net::CompletionCallback& callback)
-    : factory_(factory),
-      pac_script_(pac_script),
-      resolver_(resolver.Pass()),
-      resolver_out_(resolver_out),
-      callback_(callback) {
-}
-
-LegacyProxyResolverFactory::Job::~Job() {
-  if (factory_) {
-    resolver_->CancelSetPacScript();
-    factory_->RemoveJob(this);
-  }
-}
-
-int LegacyProxyResolverFactory::Job::Start() {
-  int error = resolver_->SetPacScript(
-      pac_script_,
-      base::Bind(&Job::OnSetPacScriptDone, base::Unretained(this)));
-  if (error != ERR_IO_PENDING) {
-    factory_ = nullptr;
-    if (error == OK)
-      *resolver_out_ = resolver_.Pass();
-    return error;
-  }
-
-  return ERR_IO_PENDING;
-}
-
-void LegacyProxyResolverFactory::Job::FactoryDestroyed() {
-  factory_ = nullptr;
-  resolver_->CancelSetPacScript();
-}
-
-void LegacyProxyResolverFactory::Job::OnSetPacScriptDone(int error) {
-  factory_->RemoveJob(this);
-  if (error == OK)
-    *resolver_out_ = resolver_.Pass();
-
-  CompletionCallback callback = callback_;
-  factory_ = nullptr;
-  if (!callback.is_null())
-    callback.Run(error);
-}
-
 ProxyResolverFactory::ProxyResolverFactory(bool expects_pac_bytes)
     : expects_pac_bytes_(expects_pac_bytes) {
 }
@@ -88,35 +16,4 @@ ProxyResolverFactory::ProxyResolverFactory(bool expects_pac_bytes)
 ProxyResolverFactory::~ProxyResolverFactory() {
 }
 
-LegacyProxyResolverFactory::LegacyProxyResolverFactory(bool expects_pac_bytes)
-    : ProxyResolverFactory(expects_pac_bytes) {
-}
-
-LegacyProxyResolverFactory::~LegacyProxyResolverFactory() {
-  for (auto job : jobs_) {
-    job->FactoryDestroyed();
-  }
-}
-
-int LegacyProxyResolverFactory::CreateProxyResolver(
-    const scoped_refptr<ProxyResolverScriptData>& pac_script,
-    scoped_ptr<ProxyResolver>* resolver,
-    const net::CompletionCallback& callback,
-    scoped_ptr<ProxyResolverFactory::Request>* request) {
-  scoped_ptr<Job> job(
-      new Job(this, pac_script, CreateProxyResolver(), resolver, callback));
-  int error = job->Start();
-  if (error != ERR_IO_PENDING)
-    return error;
-
-  jobs_.insert(job.get());
-  *request = job.Pass();
-  return ERR_IO_PENDING;
-}
-
-void LegacyProxyResolverFactory::RemoveJob(Job* job) {
-  size_t erased = jobs_.erase(job);
-  DCHECK_EQ(1u, erased);
-}
-
 }  // namespace net