OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_service.h" | 5 #include "net/proxy/proxy_service.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/histogram.h" |
11 #include "base/message_loop.h" | 12 #include "base/message_loop.h" |
12 #include "base/string_util.h" | 13 #include "base/string_util.h" |
13 #include "googleurl/src/gurl.h" | 14 #include "googleurl/src/gurl.h" |
14 #include "net/base/net_log.h" | 15 #include "net/base/net_log.h" |
15 #include "net/base/net_errors.h" | 16 #include "net/base/net_errors.h" |
16 #include "net/base/net_util.h" | 17 #include "net/base/net_util.h" |
17 #include "net/proxy/init_proxy_resolver.h" | 18 #include "net/proxy/init_proxy_resolver.h" |
18 #include "net/proxy/multi_threaded_proxy_resolver.h" | 19 #include "net/proxy/multi_threaded_proxy_resolver.h" |
19 #include "net/proxy/proxy_config_service_fixed.h" | 20 #include "net/proxy/proxy_config_service_fixed.h" |
20 #include "net/proxy/proxy_script_fetcher.h" | 21 #include "net/proxy/proxy_script_fetcher.h" |
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
760 OnCompletion(result_); | 761 OnCompletion(result_); |
761 } | 762 } |
762 } | 763 } |
763 | 764 |
764 void SyncProxyServiceHelper::OnCompletion(int rv) { | 765 void SyncProxyServiceHelper::OnCompletion(int rv) { |
765 result_ = rv; | 766 result_ = rv; |
766 event_.Signal(); | 767 event_.Signal(); |
767 } | 768 } |
768 | 769 |
769 } // namespace net | 770 } // namespace net |
OLD | NEW |