| 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| 11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
| 12 #include "base/single_thread_task_runner.h" | 12 #include "base/single_thread_task_runner.h" |
| 13 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
| 14 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
| 15 #include "base/threading/thread_task_runner_handle.h" | 15 #include "base/threading/thread_task_runner_handle.h" |
| 16 #include "base/time/time.h" | 16 #include "base/time/time.h" |
| 17 #include "net/base/net_errors.h" | 17 #include "net/base/net_errors.h" |
| 18 #include "net/base/test_completion_callback.h" | 18 #include "net/base/test_completion_callback.h" |
| 19 #include "net/dns/mock_host_resolver.h" | 19 #include "net/dns/mock_host_resolver.h" |
| 20 #include "net/log/net_log.h" | |
| 21 #include "net/log/net_log_event_type.h" | 20 #include "net/log/net_log_event_type.h" |
| 22 #include "net/log/test_net_log.h" | 21 #include "net/log/test_net_log.h" |
| 23 #include "net/log/test_net_log_entry.h" | 22 #include "net/log/test_net_log_entry.h" |
| 24 #include "net/log/test_net_log_util.h" | 23 #include "net/log/test_net_log_util.h" |
| 25 #include "net/proxy/dhcp_proxy_script_fetcher.h" | 24 #include "net/proxy/dhcp_proxy_script_fetcher.h" |
| 26 #include "net/proxy/mock_proxy_script_fetcher.h" | 25 #include "net/proxy/mock_proxy_script_fetcher.h" |
| 27 #include "net/proxy/proxy_config.h" | 26 #include "net/proxy/proxy_config.h" |
| 28 #include "net/proxy/proxy_resolver.h" | 27 #include "net/proxy/proxy_resolver.h" |
| 29 #include "net/proxy/proxy_script_decider.h" | 28 #include "net/proxy/proxy_script_decider.h" |
| 30 #include "net/proxy/proxy_script_fetcher.h" | 29 #include "net/proxy/proxy_script_fetcher.h" |
| (...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 790 | 789 |
| 791 // Run the message loop to let the DHCP fetch complete and post the results | 790 // Run the message loop to let the DHCP fetch complete and post the results |
| 792 // back. Before the fix linked to above, this would try to invoke on | 791 // back. Before the fix linked to above, this would try to invoke on |
| 793 // the callback object provided by ProxyScriptDecider after it was | 792 // the callback object provided by ProxyScriptDecider after it was |
| 794 // no longer valid. | 793 // no longer valid. |
| 795 base::RunLoop().RunUntilIdle(); | 794 base::RunLoop().RunUntilIdle(); |
| 796 } | 795 } |
| 797 | 796 |
| 798 } // namespace | 797 } // namespace |
| 799 } // namespace net | 798 } // namespace net |
| OLD | NEW |