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/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
12 #include "base/run_loop.h" | 12 #include "base/run_loop.h" |
13 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
14 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
15 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
16 #include "base/thread_task_runner_handle.h" | 16 #include "base/threading/thread_task_runner_handle.h" |
17 #include "base/time/time.h" | 17 #include "base/time/time.h" |
18 #include "net/base/net_errors.h" | 18 #include "net/base/net_errors.h" |
19 #include "net/base/test_completion_callback.h" | 19 #include "net/base/test_completion_callback.h" |
20 #include "net/dns/mock_host_resolver.h" | 20 #include "net/dns/mock_host_resolver.h" |
21 #include "net/log/net_log.h" | 21 #include "net/log/net_log.h" |
22 #include "net/log/test_net_log.h" | 22 #include "net/log/test_net_log.h" |
23 #include "net/log/test_net_log_entry.h" | 23 #include "net/log/test_net_log_entry.h" |
24 #include "net/log/test_net_log_util.h" | 24 #include "net/log/test_net_log_util.h" |
25 #include "net/proxy/dhcp_proxy_script_fetcher.h" | 25 #include "net/proxy/dhcp_proxy_script_fetcher.h" |
26 #include "net/proxy/mock_proxy_script_fetcher.h" | 26 #include "net/proxy/mock_proxy_script_fetcher.h" |
(...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
785 | 785 |
786 // Run the message loop to let the DHCP fetch complete and post the results | 786 // Run the message loop to let the DHCP fetch complete and post the results |
787 // back. Before the fix linked to above, this would try to invoke on | 787 // back. Before the fix linked to above, this would try to invoke on |
788 // the callback object provided by ProxyScriptDecider after it was | 788 // the callback object provided by ProxyScriptDecider after it was |
789 // no longer valid. | 789 // no longer valid. |
790 base::MessageLoop::current()->RunUntilIdle(); | 790 base::MessageLoop::current()->RunUntilIdle(); |
791 } | 791 } |
792 | 792 |
793 } // namespace | 793 } // namespace |
794 } // namespace net | 794 } // namespace net |
OLD | NEW |