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

chromeos/dbus/services/proxy_resolution_service_provider.cc

 // 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.
 
 #include "chromeos/dbus/services/proxy_resolution_service_provider.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "net/base/net_errors.h"
 #include "net/log/net_log_with_source.h"
 #include "net/proxy/proxy_info.h"
+#include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "url/gurl.h"
 
 namespace chromeos {
 
 struct ProxyResolutionServiceProvider::Request {
  public:
   // Constructor for returning proxy info via an asynchronous D-Bus response.
@@ skipping 162 matching lines @@
     return;
   }
 
   Request* request_ptr = request.get();
   net::CompletionCallback callback = base::Bind(
       &ProxyResolutionServiceProvider::OnResolutionComplete,
       weak_ptr_factory_.GetWeakPtr(), base::Passed(std::move(request)));
 
   VLOG(1) << "Starting network proxy resolution for "
           << request_ptr->source_url;
-  const int result =
-      delegate_->ResolveProxy(proxy_service, GURL(request_ptr->source_url),
-                              &request_ptr->proxy_info, callback);
+  const int result = proxy_service->ResolveProxy(

[James Cook, 2017/03/31 17:33:10]

optional: net::Error (or do we prefer int for errors?)

[Daniel Erat, 2017/03/31 17:46:37]

i was actually confused about this too. net::ProxyService::ResolveProxy()
returns int, and moreover, //net/proxy seems to use int extensively. net::Error
is just a regular non-class enum (defined using macros in net/base/net_errors.h
and net_error_list.h), so it probably doesn't matter at all to the compiler, but
i found that this made the code harder to follow if these are all actually
net::Errors. maybe there's some history here, though...

+      GURL(request_ptr->source_url), std::string(), &request_ptr->proxy_info,
+      callback, nullptr, nullptr, net::NetLogWithSource());
   if (result != net::ERR_IO_PENDING) {
     VLOG(1) << "Network proxy resolution completed synchronously.";
     callback.Run(result);
   }
 }
 
 void ProxyResolutionServiceProvider::OnResolutionComplete(
     std::unique_ptr<Request> request,
     int result) {
   DCHECK(request->context_getter->GetNetworkTaskRunner()
@@ skipping 25 matching lines @@
     dbus::MessageWriter writer(&signal);
     writer.AppendString(request->source_url);
     writer.AppendString(request->proxy_info.ToPacString());
     writer.AppendString(request->error);
     exported_object_->SendSignal(&signal);
     VLOG(1) << "Sending signal: " << signal.ToString();
   }
 }
 
 }  // namespace chromeos