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

Side by Side Diff: net/proxy/proxy_script_decider.h

Issue 2214693002: First step to remove SingleRequestHostResolver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: single Created 4 years, 4 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
« no previous file with comments | « net/http/http_auth_handler_negotiate.cc ('k') | net/proxy/proxy_script_decider.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 (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 #ifndef NET_PROXY_PROXY_SCRIPT_DECIDER_H_ 5 #ifndef NET_PROXY_PROXY_SCRIPT_DECIDER_H_
6 #define NET_PROXY_PROXY_SCRIPT_DECIDER_H_ 6 #define NET_PROXY_PROXY_SCRIPT_DECIDER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "base/timer/timer.h" 17 #include "base/timer/timer.h"
18 #include "net/base/address_list.h" 18 #include "net/base/address_list.h"
19 #include "net/base/completion_callback.h" 19 #include "net/base/completion_callback.h"
20 #include "net/base/net_export.h" 20 #include "net/base/net_export.h"
21 #include "net/dns/host_resolver.h" 21 #include "net/dns/host_resolver.h"
22 #include "net/dns/single_request_host_resolver.h"
23 #include "net/log/net_log.h" 22 #include "net/log/net_log.h"
24 #include "net/proxy/proxy_config.h" 23 #include "net/proxy/proxy_config.h"
25 #include "net/proxy/proxy_resolver.h" 24 #include "net/proxy/proxy_resolver.h"
26 #include "url/gurl.h" 25 #include "url/gurl.h"
27 26
28 namespace net { 27 namespace net {
29 28
30 class DhcpProxyScriptFetcher; 29 class DhcpProxyScriptFetcher;
31 class NetLogParameter; 30 class NetLogParameter;
32 class ProxyResolver; 31 class ProxyResolver;
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 191
193 // Whether to do DNS quick check 192 // Whether to do DNS quick check
194 bool quick_check_enabled_; 193 bool quick_check_enabled_;
195 194
196 // Results. 195 // Results.
197 ProxyConfig effective_config_; 196 ProxyConfig effective_config_;
198 scoped_refptr<ProxyResolverScriptData> script_data_; 197 scoped_refptr<ProxyResolverScriptData> script_data_;
199 198
200 AddressList wpad_addresses_; 199 AddressList wpad_addresses_;
201 base::OneShotTimer quick_check_timer_; 200 base::OneShotTimer quick_check_timer_;
202 std::unique_ptr<SingleRequestHostResolver> host_resolver_; 201 HostResolver* host_resolver_;
202 std::unique_ptr<HostResolver::Request> request_;
203 base::Time quick_check_start_time_; 203 base::Time quick_check_start_time_;
204 204
205 DISALLOW_COPY_AND_ASSIGN(ProxyScriptDecider); 205 DISALLOW_COPY_AND_ASSIGN(ProxyScriptDecider);
206 }; 206 };
207 207
208 } // namespace net 208 } // namespace net
209 209
210 #endif // NET_PROXY_PROXY_SCRIPT_DECIDER_H_ 210 #endif // NET_PROXY_PROXY_SCRIPT_DECIDER_H_
OLDNEW
« no previous file with comments | « net/http/http_auth_handler_negotiate.cc ('k') | net/proxy/proxy_script_decider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698