OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_resolver_factory_mojo.h" | 5 #include "net/proxy/proxy_resolver_factory_mojo.h" |
6 | 6 |
7 #include <list> | 7 #include <list> |
8 #include <map> | 8 #include <map> |
9 #include <queue> | 9 #include <queue> |
10 #include <string> | 10 #include <string> |
11 | 11 |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "base/memory/scoped_vector.h" | 14 #include "base/memory/scoped_vector.h" |
15 #include "base/run_loop.h" | 15 #include "base/run_loop.h" |
16 #include "base/stl_util.h" | 16 #include "base/stl_util.h" |
17 #include "base/values.h" | 17 #include "base/values.h" |
18 #include "mojo/common/common_type_converters.h" | 18 #include "mojo/common/common_type_converters.h" |
| 19 #include "mojo/public/cpp/bindings/binding.h" |
19 #include "net/base/load_states.h" | 20 #include "net/base/load_states.h" |
20 #include "net/base/net_errors.h" | 21 #include "net/base/net_errors.h" |
21 #include "net/base/test_completion_callback.h" | 22 #include "net/base/test_completion_callback.h" |
22 #include "net/dns/host_resolver.h" | 23 #include "net/dns/host_resolver.h" |
23 #include "net/log/test_net_log.h" | 24 #include "net/log/test_net_log.h" |
24 #include "net/proxy/mojo_proxy_resolver_factory.h" | 25 #include "net/proxy/mojo_proxy_resolver_factory.h" |
25 #include "net/proxy/mojo_proxy_type_converters.h" | 26 #include "net/proxy/mojo_proxy_type_converters.h" |
26 #include "net/proxy/proxy_info.h" | 27 #include "net/proxy/proxy_info.h" |
27 #include "net/proxy/proxy_resolver.h" | 28 #include "net/proxy/proxy_resolver.h" |
28 #include "net/proxy/proxy_resolver_error_observer.h" | 29 #include "net/proxy/proxy_resolver_error_observer.h" |
29 #include "net/proxy/proxy_resolver_script_data.h" | 30 #include "net/proxy/proxy_resolver_script_data.h" |
30 #include "net/test/event_waiter.h" | 31 #include "net/test/event_waiter.h" |
31 #include "testing/gtest/include/gtest/gtest.h" | 32 #include "testing/gtest/include/gtest/gtest.h" |
32 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" | |
33 #include "url/gurl.h" | 33 #include "url/gurl.h" |
34 | 34 |
35 namespace net { | 35 namespace net { |
36 | 36 |
37 namespace { | 37 namespace { |
38 | 38 |
39 const char kScriptData[] = "FooBarBaz"; | 39 const char kScriptData[] = "FooBarBaz"; |
40 const char kExampleUrl[] = "http://www.example.com"; | 40 const char kExampleUrl[] = "http://www.example.com"; |
41 | 41 |
42 struct CreateProxyResolverAction { | 42 struct CreateProxyResolverAction { |
(...skipping 841 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
884 mock_proxy_resolver_.ClearBlockedClients(); | 884 mock_proxy_resolver_.ClearBlockedClients(); |
885 request->WaitForResult(); | 885 request->WaitForResult(); |
886 } | 886 } |
887 | 887 |
888 TEST_F(ProxyResolverFactoryMojoTest, DeleteResolver) { | 888 TEST_F(ProxyResolverFactoryMojoTest, DeleteResolver) { |
889 CreateProxyResolver(); | 889 CreateProxyResolver(); |
890 proxy_resolver_mojo_.reset(); | 890 proxy_resolver_mojo_.reset(); |
891 on_delete_callback_.WaitForResult(); | 891 on_delete_callback_.WaitForResult(); |
892 } | 892 } |
893 } // namespace net | 893 } // namespace net |
OLD | NEW |