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/multi_threaded_proxy_resolver.h" | 5 #include "net/proxy/multi_threaded_proxy_resolver.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.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/stl_util.h" | 13 #include "base/stl_util.h" |
14 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
15 #include "base/strings/stringprintf.h" | 15 #include "base/strings/stringprintf.h" |
16 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
17 #include "base/synchronization/lock.h" | 17 #include "base/synchronization/lock.h" |
18 #include "base/synchronization/waitable_event.h" | 18 #include "base/synchronization/waitable_event.h" |
19 #include "base/threading/platform_thread.h" | 19 #include "base/threading/platform_thread.h" |
20 #include "net/base/net_errors.h" | 20 #include "net/base/net_errors.h" |
21 #include "net/base/test_completion_callback.h" | 21 #include "net/base/test_completion_callback.h" |
22 #include "net/log/net_log.h" | |
23 #include "net/log/net_log_event_type.h" | 22 #include "net/log/net_log_event_type.h" |
| 23 #include "net/log/net_log_with_source.h" |
24 #include "net/log/test_net_log.h" | 24 #include "net/log/test_net_log.h" |
25 #include "net/log/test_net_log_entry.h" | 25 #include "net/log/test_net_log_entry.h" |
26 #include "net/log/test_net_log_util.h" | 26 #include "net/log/test_net_log_util.h" |
27 #include "net/proxy/mock_proxy_resolver.h" | 27 #include "net/proxy/mock_proxy_resolver.h" |
28 #include "net/proxy/proxy_info.h" | 28 #include "net/proxy/proxy_info.h" |
29 #include "net/proxy/proxy_resolver_factory.h" | 29 #include "net/proxy/proxy_resolver_factory.h" |
30 #include "net/test/gtest_util.h" | 30 #include "net/test/gtest_util.h" |
31 #include "testing/gmock/include/gmock/gmock.h" | 31 #include "testing/gmock/include/gmock/gmock.h" |
32 #include "testing/gtest/include/gtest/gtest.h" | 32 #include "testing/gtest/include/gtest/gtest.h" |
33 #include "url/gurl.h" | 33 #include "url/gurl.h" |
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
783 } | 783 } |
784 // The factory destructor will block until the worker thread stops, but it may | 784 // The factory destructor will block until the worker thread stops, but it may |
785 // post tasks to the origin message loop which are still pending. Run them | 785 // post tasks to the origin message loop which are still pending. Run them |
786 // now to ensure it works as expected. | 786 // now to ensure it works as expected. |
787 base::RunLoop().RunUntilIdle(); | 787 base::RunLoop().RunUntilIdle(); |
788 } | 788 } |
789 | 789 |
790 } // namespace | 790 } // namespace |
791 | 791 |
792 } // namespace net | 792 } // namespace net |
OLD | NEW |