| 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 ec1a754d4ae487d1b1adc0db6715e52ba4e25fe4..44d4e8312ca1b89241b85cf8568491b030515ddf 100644
|
| --- a/chromeos/dbus/services/proxy_resolution_service_provider.cc
|
| +++ b/chromeos/dbus/services/proxy_resolution_service_provider.cc
|
| @@ -1,16 +1,17 @@
|
| // 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 <string>
|
| #include <utility>
|
|
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/macros.h"
|
| #include "base/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"
|
| @@ -126,22 +127,23 @@ 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_), net::LOAD_NORMAL, &request->proxy_info_,
|
| - completion_callback, NULL, NULL, net::BoundNetLog());
|
| + GURL(request->source_url_), std::string(), net::LOAD_NORMAL,
|
| + &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,
|
|
|