Index: content/browser/resolve_proxy_msg_helper.cc |
diff --git a/content/browser/resolve_proxy_msg_helper.cc b/content/browser/resolve_proxy_msg_helper.cc |
index 7b1e04ed0bc975bf3e16d713f63c3a91f1d92f9d..f2996d7b3c2f48a3702ac1bdf4a0110e6260d7d5 100644 |
--- a/content/browser/resolve_proxy_msg_helper.cc |
+++ b/content/browser/resolve_proxy_msg_helper.cc |
@@ -1,21 +1,20 @@ |
// 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 "content/browser/resolve_proxy_msg_helper.h" |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
#include "base/compiler_specific.h" |
#include "content/common/view_messages.h" |
-#include "net/base/load_flags.h" |
#include "net/base/net_errors.h" |
#include "net/url_request/url_request_context.h" |
#include "net/url_request/url_request_context_getter.h" |
namespace content { |
ResolveProxyMsgHelper::ResolveProxyMsgHelper( |
net::URLRequestContextGetter* getter) |
: BrowserMessageFilter(ViewMsgStart), |
context_getter_(getter), |
@@ -85,21 +84,21 @@ void ResolveProxyMsgHelper::StartPendingRequest() { |
// Verify the request wasn't started yet. |
DCHECK(NULL == req.pac_req); |
if (context_getter_.get()) { |
proxy_service_ = context_getter_->GetURLRequestContext()->proxy_service(); |
context_getter_ = NULL; |
} |
// Start the request. |
int result = proxy_service_->ResolveProxy( |
- req.url, std::string(), net::LOAD_NORMAL, &proxy_info_, |
+ req.url, std::string(), &proxy_info_, |
base::Bind(&ResolveProxyMsgHelper::OnResolveProxyCompleted, |
base::Unretained(this)), |
&req.pac_req, NULL, net::BoundNetLog()); |
// Completed synchronously. |
if (result != net::ERR_IO_PENDING) |
OnResolveProxyCompleted(result); |
} |
} // namespace content |