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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
88 if (context_getter_.get()) { | 88 if (context_getter_.get()) { |
89 proxy_service_ = context_getter_->GetURLRequestContext()->proxy_service(); | 89 proxy_service_ = context_getter_->GetURLRequestContext()->proxy_service(); |
90 context_getter_ = NULL; | 90 context_getter_ = NULL; |
91 } | 91 } |
92 | 92 |
93 // Start the request. | 93 // Start the request. |
94 int result = proxy_service_->ResolveProxy( | 94 int result = proxy_service_->ResolveProxy( |
95 req.url, net::LOAD_NORMAL, &proxy_info_, | 95 req.url, net::LOAD_NORMAL, &proxy_info_, |
96 base::Bind(&ResolveProxyMsgHelper::OnResolveProxyCompleted, | 96 base::Bind(&ResolveProxyMsgHelper::OnResolveProxyCompleted, |
97 base::Unretained(this)), | 97 base::Unretained(this)), |
98 &req.pac_req, NULL, net::BoundNetLog()); | 98 &req.pac_req, nullptr, "", net::BoundNetLog()); |
bengr
2016/02/16 20:00:13
NULL and std::string()
RyanSturm
2016/02/17 21:46:11
Done.
| |
99 | 99 |
100 // Completed synchronously. | 100 // Completed synchronously. |
101 if (result != net::ERR_IO_PENDING) | 101 if (result != net::ERR_IO_PENDING) |
102 OnResolveProxyCompleted(result); | 102 OnResolveProxyCompleted(result); |
103 } | 103 } |
104 | 104 |
105 } // namespace content | 105 } // namespace content |
OLD | NEW |