Index: chromeos/dbus/services/proxy_resolution_service_provider.cc |
diff --git a/chromeos/dbus/services/proxy_resolution_service_provider.cc b/chromeos/dbus/services/proxy_resolution_service_provider.cc |
index 9c99685e1dca8f15d7191e7095c3de4b495eabe4..863313a7ee3302946fe96d5c38853fcfeee034c9 100644 |
--- a/chromeos/dbus/services/proxy_resolution_service_provider.cc |
+++ b/chromeos/dbus/services/proxy_resolution_service_provider.cc |
@@ -6,21 +6,20 @@ |
#include <string> |
#include <utility> |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
#include "base/macros.h" |
#include "base/threading/thread_task_runner_handle.h" |
#include "dbus/bus.h" |
#include "dbus/message.h" |
-#include "net/base/load_flags.h" |
#include "net/base/net_errors.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" |
namespace chromeos { |
// The ProxyResolverInterface implementation used in production. |
class ProxyResolverImpl : public ProxyResolverInterface { |
@@ -127,23 +126,22 @@ class ProxyResolverImpl : public ProxyResolverInterface { |
return; |
} |
VLOG(1) << "Starting network proxy resolution for " |
<< request->source_url_; |
net::CompletionCallback completion_callback = |
base::Bind(&Request::OnCompletion, |
base::Unretained(request), |
origin_thread); |
const int result = proxy_service->ResolveProxy( |
- GURL(request->source_url_), std::string(), net::LOAD_NORMAL, |
- &request->proxy_info_, completion_callback, NULL, NULL, |
- net::BoundNetLog()); |
+ GURL(request->source_url_), std::string(), &request->proxy_info_, |
+ completion_callback, NULL, NULL, net::BoundNetLog()); |
if (result != net::ERR_IO_PENDING) { |
VLOG(1) << "Network proxy resolution completed synchronously."; |
completion_callback.Run(result); |
} |
} |
// Called on UI thread as task posted from Request::OnCompletion on IO |
// thread. |
void NotifyProxyResolved( |
const std::string& signal_interface, |