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 "net/proxy/proxy_script_fetcher_impl.h" | 5 #include "net/proxy/proxy_script_fetcher_impl.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/i18n/icu_string_conversions.h" | 8 #include "base/i18n/icu_string_conversions.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
128 std::string charset; | 128 std::string charset; |
129 std::string data; | 129 std::string data; |
130 if (!DataURL::Parse(url, &mime_type, &charset, &data)) | 130 if (!DataURL::Parse(url, &mime_type, &charset, &data)) |
131 return ERR_FAILED; | 131 return ERR_FAILED; |
132 | 132 |
133 ConvertResponseToUTF16(charset, data, text); | 133 ConvertResponseToUTF16(charset, data, text); |
134 return OK; | 134 return OK; |
135 } | 135 } |
136 | 136 |
137 cur_request_ = | 137 cur_request_ = |
138 url_request_context_->CreateRequest(url, DEFAULT_PRIORITY, this); | 138 url_request_context_->CreateRequest(url, DEFAULT_PRIORITY, this, NULL); |
139 cur_request_->set_method("GET"); | 139 cur_request_->set_method("GET"); |
140 | 140 |
141 // Make sure that the PAC script is downloaded using a direct connection, | 141 // Make sure that the PAC script is downloaded using a direct connection, |
142 // to avoid circular dependencies (fetching is a part of proxy resolution). | 142 // to avoid circular dependencies (fetching is a part of proxy resolution). |
143 // Also disable the use of the disk cache. The cache is disabled so that if | 143 // Also disable the use of the disk cache. The cache is disabled so that if |
144 // the user switches networks we don't potentially use the cached response | 144 // the user switches networks we don't potentially use the cached response |
145 // from old network when we should in fact be re-fetching on the new network. | 145 // from old network when we should in fact be re-fetching on the new network. |
146 // If the PAC script is hosted on an HTTPS server we bypass revocation | 146 // If the PAC script is hosted on an HTTPS server we bypass revocation |
147 // checking in order to avoid a circular dependency when attempting to fetch | 147 // checking in order to avoid a circular dependency when attempting to fetch |
148 // the OCSP response or CRL. We could make the revocation check go direct but | 148 // the OCSP response or CRL. We could make the revocation check go direct but |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 // is still applicable. | 314 // is still applicable. |
315 if (cur_request_id_ != id) | 315 if (cur_request_id_ != id) |
316 return; | 316 return; |
317 | 317 |
318 DCHECK(cur_request_.get()); | 318 DCHECK(cur_request_.get()); |
319 result_code_ = ERR_TIMED_OUT; | 319 result_code_ = ERR_TIMED_OUT; |
320 cur_request_->Cancel(); | 320 cur_request_->Cancel(); |
321 } | 321 } |
322 | 322 |
323 } // namespace net | 323 } // namespace net |
OLD | NEW |