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

Side by Side Diff: net/dns/mojo_host_resolver_impl.h

Issue 2489113002: Remove stl_util's deletion functions from MojoHostResolverImpl. (Closed)
Patch Set: add missing include, rebase Created 4 years 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
« no previous file with comments | « no previous file | net/dns/mojo_host_resolver_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef NET_DNS_MOJO_HOST_RESOLVER_IMPL_H_ 5 #ifndef NET_DNS_MOJO_HOST_RESOLVER_IMPL_H_
6 #define NET_DNS_MOJO_HOST_RESOLVER_IMPL_H_ 6 #define NET_DNS_MOJO_HOST_RESOLVER_IMPL_H_
7 7
8 #include <set> 8 #include <list>
9 #include <memory>
9 10
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "base/threading/thread_checker.h" 12 #include "base/threading/thread_checker.h"
12 #include "net/interfaces/host_resolver_service.mojom.h" 13 #include "net/interfaces/host_resolver_service.mojom.h"
13 #include "net/log/net_log_with_source.h" 14 #include "net/log/net_log_with_source.h"
14 15
15 namespace net { 16 namespace net {
16 17
17 class HostResolver; 18 class HostResolver;
18 19
(...skipping 10 matching lines...) Expand all
29 ~MojoHostResolverImpl(); 30 ~MojoHostResolverImpl();
30 31
31 void Resolve(std::unique_ptr<HostResolver::RequestInfo> request_info, 32 void Resolve(std::unique_ptr<HostResolver::RequestInfo> request_info,
32 interfaces::HostResolverRequestClientPtr client); 33 interfaces::HostResolverRequestClientPtr client);
33 34
34 bool request_in_progress() { return !pending_jobs_.empty(); } 35 bool request_in_progress() { return !pending_jobs_.empty(); }
35 36
36 private: 37 private:
37 class Job; 38 class Job;
38 39
39 // Removes |job| from the set of pending jobs, and deletes it. 40 // Removes |job| from the set of pending jobs.
40 void DeleteJob(Job* job); 41 void DeleteJob(std::list<Job>::iterator job);
41 42
42 // Resolver for resolving incoming requests. Not owned. 43 // Resolver for resolving incoming requests. Not owned.
43 net::HostResolver* resolver_; 44 net::HostResolver* resolver_;
44 45
45 // The NetLogWithSource to be passed to |resolver_| for all requests. 46 // The NetLogWithSource to be passed to |resolver_| for all requests.
46 const NetLogWithSource net_log_; 47 const NetLogWithSource net_log_;
47 48
48 // All pending jobs, so they can be cancelled when this service is destroyed. 49 // All pending jobs, so they can be cancelled when this service is destroyed.
49 // Owns all jobs. 50 std::list<Job> pending_jobs_;
50 std::set<Job*> pending_jobs_;
51 51
52 base::ThreadChecker thread_checker_; 52 base::ThreadChecker thread_checker_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(MojoHostResolverImpl); 54 DISALLOW_COPY_AND_ASSIGN(MojoHostResolverImpl);
55 }; 55 };
56 56
57 } // namespace net 57 } // namespace net
58 58
59 #endif // NET_DNS_MOJO_HOST_RESOLVER_IMPL_H_ 59 #endif // NET_DNS_MOJO_HOST_RESOLVER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | net/dns/mojo_host_resolver_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698