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" |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 if (context_getter_.get()) { | 87 if (context_getter_.get()) { |
88 proxy_service_ = context_getter_->GetURLRequestContext()->proxy_service(); | 88 proxy_service_ = context_getter_->GetURLRequestContext()->proxy_service(); |
89 context_getter_ = NULL; | 89 context_getter_ = NULL; |
90 } | 90 } |
91 | 91 |
92 // Start the request. | 92 // Start the request. |
93 int result = proxy_service_->ResolveProxy( | 93 int result = proxy_service_->ResolveProxy( |
94 req.url, std::string(), &proxy_info_, | 94 req.url, std::string(), &proxy_info_, |
95 base::Bind(&ResolveProxyMsgHelper::OnResolveProxyCompleted, | 95 base::Bind(&ResolveProxyMsgHelper::OnResolveProxyCompleted, |
96 base::Unretained(this)), | 96 base::Unretained(this)), |
97 &req.pac_req, NULL, net::BoundNetLog()); | 97 &req.pac_req, NULL, net::NetLogWithSource()); |
98 | 98 |
99 // Completed synchronously. | 99 // Completed synchronously. |
100 if (result != net::ERR_IO_PENDING) | 100 if (result != net::ERR_IO_PENDING) |
101 OnResolveProxyCompleted(result); | 101 OnResolveProxyCompleted(result); |
102 } | 102 } |
103 | 103 |
104 } // namespace content | 104 } // namespace content |
OLD | NEW |