chromeos: Remove LibCrosService's ResolveNetworkProxy method

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>
 
@@ skipping 12 matching lines @@
 namespace dbus {
 class MethodCall;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace chromeos {
 
-// This class provides proxy resolution service for CrosDBusService.
-// It processes proxy resolution requests for ChromeOS clients.
+// This class processes proxy resolution requests for Chrome OS clients.
 //
 // The following method is exported:
 //
-// Interface: org.chromium.LibCrosServiceInterface (kLibCrosServiceInterface)
-// Method: ResolveNetworkProxy (kResolveNetworkProxy)
+// Interface: org.chromium.NetworkProxyServiceInterface
+//            (kNetworkProxyServiceInterface)
+// Method: ResolveProxy (kNetworkProxyServiceResolveProxyMethod)
 // Parameters: string:source_url
-//             string:signal_interface (optional)
-//             string:signal_name (optional)
 //
-//   Resolves the proxy for |source_url|. If |signal_interface| and
-//   |signal_name| are supplied, returns an empty reply immediately and
-//   asynchronously emits a D-Bus signal to the requested destination.
-//   Otherwise, returns proxy information an asynchronous response without
-//   emitting a signal.
+//   Resolves the proxy for |source_url| and returns proxy information via an
+//   asynchronous response containing two values:
 //
-//   The signal (if requested) will contain three values:
-//   - string:source_url - requested source URL.
 //   - string:proxy_info - proxy info for the source URL in PAC format
 //                         like "PROXY cache.example.com:12345"
 //   - string:error_message - error message. Empty if successful.
-//
-//   The method call response (if requested) will contain just two values:
-//   - string:proxy_info - proxy info for the source URL in PAC format
-//                         like "PROXY cache.example.com:12345"
-//   - string:error_message - error message. Empty if successful.
 //
 // This service can be manually tested using dbus-send:
 //
 //   % dbus-send --system --type=method_call --print-reply
-//       --dest=org.chromium.LibCrosService
-//       /org/chromium/LibCrosService
-//       org.chromium.LibCrosServiceInterface.ResolveNetworkProxy
+//       --dest=org.chromium.NetworkProxyService
+//       /org/chromium/NetworkProxyService
+//       org.chromium.NetworkProxyServiceInterface.ResolveProxy
 //       string:https://www.google.com/
 //
 class CHROMEOS_EXPORT ProxyResolutionServiceProvider
     : public CrosDBusService::ServiceProviderInterface {
  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;
   };
 
-  ProxyResolutionServiceProvider(const std::string& dbus_interface,
-                                 const std::string& dbus_method_name,
-                                 std::unique_ptr<Delegate> delegate);
+  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.
   struct Request;
 
   // Returns true if called on |origin_thread_|.
@@ skipping 28 matching lines @@
   static void OnResolutionComplete(
       std::unique_ptr<Request> request,
       scoped_refptr<base::SingleThreadTaskRunner> notify_thread,
       NotifyCallback notify_callback,
       int result);
 
   // Called on UI thread from OnResolutionComplete() to pass the resolved proxy
   // information to the client over D-Bus.
   void NotifyProxyResolved(std::unique_ptr<Request> request);
 
-  const std::string dbus_interface_;
-  const std::string dbus_method_name_;
   std::unique_ptr<Delegate> delegate_;
   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_