chromeos: Simplify D-Bus proxy provider (but not tests).

chromeos/dbus/services/proxy_resolution_service_provider.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROMEOS_DBUS_SERVICES_PROXY_RESOLUTION_SERVICE_PROVIDER_H_
 #define CHROMEOS_DBUS_SERVICES_PROXY_RESOLUTION_SERVICE_PROVIDER_H_
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/services/cros_dbus_service.h"
 #include "dbus/exported_object.h"
 #include "net/base/completion_callback.h"
 
-class GURL;
-
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace dbus {
 class MethodCall;
 }
 
 namespace net {
-class ProxyInfo;
-class ProxyService;
 class URLRequestContextGetter;
 }
 
 namespace chromeos {
 
 // This class provides proxy resolution service for CrosDBusService.
 // It processes proxy resolution requests for ChromeOS clients.
 //
 // The following method is exported:
 //
@@ skipping 33 matching lines @@
  public:
   // Delegate interface providing additional resources to
   // ProxyResolutionServiceProvider.
   class CHROMEOS_EXPORT Delegate {
    public:
     virtual ~Delegate() {}
 
     // Returns the request context used to perform proxy resolution.
     // Always called on UI thread.
     virtual scoped_refptr<net::URLRequestContextGetter> GetRequestContext() = 0;
-
-    // Thin wrapper around net::ProxyService::ResolveProxy() to make testing
-    // easier.
-    virtual int ResolveProxy(net::ProxyService* proxy_service,
-                             const GURL& url,
-                             net::ProxyInfo* results,
-                             const net::CompletionCallback& callback) = 0;
   };
 
   explicit ProxyResolutionServiceProvider(std::unique_ptr<Delegate> delegate);
   ~ProxyResolutionServiceProvider() override;
 
   // CrosDBusService::ServiceProviderInterface:
   void Start(scoped_refptr<dbus::ExportedObject> exported_object) override;
 
  private:
   // Data used for a single proxy resolution.
@@ skipping 27 matching lines @@
   scoped_refptr<dbus::ExportedObject> exported_object_;
   scoped_refptr<base::SingleThreadTaskRunner> origin_thread_;
   base::WeakPtrFactory<ProxyResolutionServiceProvider> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyResolutionServiceProvider);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_SERVICES_PROXY_RESOLUTION_SERVICE_PROVIDER_H_