| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/resolve_proxy_msg_helper.h" | 5 #include "content/browser/resolve_proxy_msg_helper.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "content/common/view_messages.h" | 10 #include "content/common/view_messages.h" |
| 11 #include "net/base/load_flags.h" |
| 11 #include "net/base/net_errors.h" | 12 #include "net/base/net_errors.h" |
| 12 #include "net/url_request/url_request_context.h" | 13 #include "net/url_request/url_request_context.h" |
| 13 #include "net/url_request/url_request_context_getter.h" | 14 #include "net/url_request/url_request_context_getter.h" |
| 14 | 15 |
| 15 namespace content { | 16 namespace content { |
| 16 | 17 |
| 17 ResolveProxyMsgHelper::ResolveProxyMsgHelper( | 18 ResolveProxyMsgHelper::ResolveProxyMsgHelper( |
| 18 net::URLRequestContextGetter* getter) | 19 net::URLRequestContextGetter* getter) |
| 19 : BrowserMessageFilter(ViewMsgStart), | 20 : BrowserMessageFilter(ViewMsgStart), |
| 20 context_getter_(getter), | 21 context_getter_(getter), |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 // Verify the request wasn't started yet. | 85 // Verify the request wasn't started yet. |
| 85 DCHECK(NULL == req.pac_req); | 86 DCHECK(NULL == req.pac_req); |
| 86 | 87 |
| 87 if (context_getter_.get()) { | 88 if (context_getter_.get()) { |
| 88 proxy_service_ = context_getter_->GetURLRequestContext()->proxy_service(); | 89 proxy_service_ = context_getter_->GetURLRequestContext()->proxy_service(); |
| 89 context_getter_ = NULL; | 90 context_getter_ = NULL; |
| 90 } | 91 } |
| 91 | 92 |
| 92 // Start the request. | 93 // Start the request. |
| 93 int result = proxy_service_->ResolveProxy( | 94 int result = proxy_service_->ResolveProxy( |
| 94 req.url, &proxy_info_, | 95 req.url, net::LOAD_NORMAL, &proxy_info_, |
| 95 base::Bind(&ResolveProxyMsgHelper::OnResolveProxyCompleted, | 96 base::Bind(&ResolveProxyMsgHelper::OnResolveProxyCompleted, |
| 96 base::Unretained(this)), | 97 base::Unretained(this)), |
| 97 &req.pac_req, net::BoundNetLog()); | 98 &req.pac_req, NULL, net::BoundNetLog()); |
| 98 | 99 |
| 99 // Completed synchronously. | 100 // Completed synchronously. |
| 100 if (result != net::ERR_IO_PENDING) | 101 if (result != net::ERR_IO_PENDING) |
| 101 OnResolveProxyCompleted(result); | 102 OnResolveProxyCompleted(result); |
| 102 } | 103 } |
| 103 | 104 |
| 104 } // namespace content | 105 } // namespace content |
| OLD | NEW |