Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Side by Side Diff: net/proxy/proxy_resolver_factory_mojo_unittest.cc

Issue 2333923004: Extracting NetLog inner classes into their own classes. (Closed)
Patch Set: Some nit fixes and better, impl-agnostic naming of net_log_parameters_callback_typedef.h -> net/log… Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <memory> 9 #include <memory>
10 #include <queue> 10 #include <queue>
11 #include <string> 11 #include <string>
12 #include <utility> 12 #include <utility>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/bind.h" 15 #include "base/bind.h"
16 #include "base/memory/ptr_util.h" 16 #include "base/memory/ptr_util.h"
17 #include "base/message_loop/message_loop.h" 17 #include "base/message_loop/message_loop.h"
18 #include "base/run_loop.h" 18 #include "base/run_loop.h"
19 #include "base/stl_util.h" 19 #include "base/stl_util.h"
20 #include "base/values.h" 20 #include "base/values.h"
21 #include "mojo/common/common_type_converters.h" 21 #include "mojo/common/common_type_converters.h"
22 #include "mojo/public/cpp/bindings/binding.h" 22 #include "mojo/public/cpp/bindings/binding.h"
23 #include "net/base/load_states.h" 23 #include "net/base/load_states.h"
24 #include "net/base/net_errors.h" 24 #include "net/base/net_errors.h"
25 #include "net/base/test_completion_callback.h" 25 #include "net/base/test_completion_callback.h"
26 #include "net/dns/host_resolver.h" 26 #include "net/dns/host_resolver.h"
27 #include "net/log/net_log_event_type.h" 27 #include "net/log/net_log_event_type.h"
28 #include "net/log/net_log_with_source.h"
28 #include "net/log/test_net_log.h" 29 #include "net/log/test_net_log.h"
29 #include "net/proxy/mojo_proxy_resolver_factory.h" 30 #include "net/proxy/mojo_proxy_resolver_factory.h"
30 #include "net/proxy/mojo_proxy_type_converters.h" 31 #include "net/proxy/mojo_proxy_type_converters.h"
31 #include "net/proxy/proxy_info.h" 32 #include "net/proxy/proxy_info.h"
32 #include "net/proxy/proxy_resolver.h" 33 #include "net/proxy/proxy_resolver.h"
33 #include "net/proxy/proxy_resolver_error_observer.h" 34 #include "net/proxy/proxy_resolver_error_observer.h"
34 #include "net/proxy/proxy_resolver_script_data.h" 35 #include "net/proxy/proxy_resolver_script_data.h"
35 #include "net/test/event_waiter.h" 36 #include "net/test/event_waiter.h"
36 #include "net/test/gtest_util.h" 37 #include "net/test/gtest_util.h"
37 #include "testing/gmock/include/gmock/gmock.h" 38 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 872 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 mock_proxy_resolver_.ClearBlockedClients(); 911 mock_proxy_resolver_.ClearBlockedClients();
911 request->WaitForResult(); 912 request->WaitForResult();
912 } 913 }
913 914
914 TEST_F(ProxyResolverFactoryMojoTest, DeleteResolver) { 915 TEST_F(ProxyResolverFactoryMojoTest, DeleteResolver) {
915 CreateProxyResolver(); 916 CreateProxyResolver();
916 proxy_resolver_mojo_.reset(); 917 proxy_resolver_mojo_.reset();
917 on_delete_callback_.WaitForResult(); 918 on_delete_callback_.WaitForResult();
918 } 919 }
919 } // namespace net 920 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698