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_decider.h" | 5 #include "net/proxy/proxy_script_decider.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
12 #include "base/format_macros.h" | 12 #include "base/format_macros.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/metrics/histogram_macros.h" | 14 #include "base/metrics/histogram_macros.h" |
15 #include "base/strings/string_util.h" | 15 #include "base/strings/string_util.h" |
16 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
17 #include "base/values.h" | 17 #include "base/values.h" |
18 #include "net/base/net_errors.h" | 18 #include "net/base/net_errors.h" |
| 19 #include "net/log/net_log_capture_mode.h" |
19 #include "net/log/net_log_event_type.h" | 20 #include "net/log/net_log_event_type.h" |
20 #include "net/log/net_log_source_type.h" | 21 #include "net/log/net_log_source_type.h" |
21 #include "net/proxy/dhcp_proxy_script_fetcher.h" | 22 #include "net/proxy/dhcp_proxy_script_fetcher.h" |
22 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" | 23 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" |
23 #include "net/proxy/proxy_script_fetcher.h" | 24 #include "net/proxy/proxy_script_fetcher.h" |
24 #include "net/url_request/url_request_context.h" | 25 #include "net/url_request/url_request_context.h" |
25 | 26 |
26 namespace net { | 27 namespace net { |
27 | 28 |
28 namespace { | 29 namespace { |
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
475 } | 476 } |
476 | 477 |
477 // This is safe to call in any state. | 478 // This is safe to call in any state. |
478 if (dhcp_proxy_script_fetcher_) | 479 if (dhcp_proxy_script_fetcher_) |
479 dhcp_proxy_script_fetcher_->Cancel(); | 480 dhcp_proxy_script_fetcher_->Cancel(); |
480 | 481 |
481 DidComplete(); | 482 DidComplete(); |
482 } | 483 } |
483 | 484 |
484 } // namespace net | 485 } // namespace net |
OLD | NEW |