| 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_list.h" | 5 #include "net/proxy/proxy_list.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/strings/string_tokenizer.h" | 9 #include "base/strings/string_tokenizer.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| 11 #include "base/values.h" | 11 #include "base/values.h" |
| 12 #include "net/log/net_log.h" |
| 12 #include "net/log/net_log_event_type.h" | 13 #include "net/log/net_log_event_type.h" |
| 14 #include "net/log/net_log_with_source.h" |
| 13 #include "net/proxy/proxy_server.h" | 15 #include "net/proxy/proxy_server.h" |
| 14 | 16 |
| 15 using base::TimeDelta; | 17 using base::TimeDelta; |
| 16 using base::TimeTicks; | 18 using base::TimeTicks; |
| 17 | 19 |
| 18 namespace net { | 20 namespace net { |
| 19 | 21 |
| 20 ProxyList::ProxyList() { | 22 ProxyList::ProxyList() { |
| 21 } | 23 } |
| 22 | 24 |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 // If any additional proxies to bypass are specified, add to the retry map | 230 // If any additional proxies to bypass are specified, add to the retry map |
| 229 // as well. | 231 // as well. |
| 230 for (const ProxyServer& additional_proxy : additional_proxies_to_bypass) { | 232 for (const ProxyServer& additional_proxy : additional_proxies_to_bypass) { |
| 231 AddProxyToRetryList(proxy_retry_info, retry_delay, reconsider, | 233 AddProxyToRetryList(proxy_retry_info, retry_delay, reconsider, |
| 232 additional_proxy, net_error, net_log); | 234 additional_proxy, net_error, net_log); |
| 233 } | 235 } |
| 234 } | 236 } |
| 235 } | 237 } |
| 236 | 238 |
| 237 } // namespace net | 239 } // namespace net |
| OLD | NEW |