Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(185)

Side by Side Diff: net/proxy/proxy_script_fetcher_impl.cc

Issue 51953002: [Net] Add a priority parameter to URLRequest's constructor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile failures Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 std::string mime_type; 126 std::string mime_type;
127 std::string charset; 127 std::string charset;
128 std::string data; 128 std::string data;
129 if (!DataURL::Parse(url, &mime_type, &charset, &data)) 129 if (!DataURL::Parse(url, &mime_type, &charset, &data))
130 return ERR_FAILED; 130 return ERR_FAILED;
131 131
132 ConvertResponseToUTF16(charset, data, text); 132 ConvertResponseToUTF16(charset, data, text);
133 return OK; 133 return OK;
134 } 134 }
135 135
136 cur_request_.reset(url_request_context_->CreateRequest(url, this)); 136 cur_request_ =
137 url_request_context_->CreateRequest(url, DEFAULT_PRIORITY, this);
mmenke 2013/10/31 15:23:43 include request_priority.h?
akalin 2013/10/31 20:02:02 Done. Fixed another file, too.
137 cur_request_->set_method("GET"); 138 cur_request_->set_method("GET");
138 139
139 // Make sure that the PAC script is downloaded using a direct connection, 140 // Make sure that the PAC script is downloaded using a direct connection,
140 // to avoid circular dependencies (fetching is a part of proxy resolution). 141 // to avoid circular dependencies (fetching is a part of proxy resolution).
141 // Also disable the use of the disk cache. The cache is disabled so that if 142 // Also disable the use of the disk cache. The cache is disabled so that if
142 // the user switches networks we don't potentially use the cached response 143 // the user switches networks we don't potentially use the cached response
143 // from old network when we should in fact be re-fetching on the new network. 144 // from old network when we should in fact be re-fetching on the new network.
144 // If the PAC script is hosted on an HTTPS server we bypass revocation 145 // If the PAC script is hosted on an HTTPS server we bypass revocation
145 // checking in order to avoid a circular dependency when attempting to fetch 146 // checking in order to avoid a circular dependency when attempting to fetch
146 // the OCSP response or CRL. We could make the revocation check go direct but 147 // 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
312 // is still applicable. 313 // is still applicable.
313 if (cur_request_id_ != id) 314 if (cur_request_id_ != id)
314 return; 315 return;
315 316
316 DCHECK(cur_request_.get()); 317 DCHECK(cur_request_.get());
317 result_code_ = ERR_TIMED_OUT; 318 result_code_ = ERR_TIMED_OUT;
318 cur_request_->Cancel(); 319 cur_request_->Cancel();
319 } 320 }
320 321
321 } // namespace net 322 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698