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

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

Issue 2944313003: Remove the dependence on BrowserThread::FILE for (Closed)
Patch Set: address mmenke's comments Created 3 years, 6 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/proxy/proxy_config_service_linux_unittest.cc ('k') | net/proxy/proxy_service.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_SERVICE_H_ 5 #ifndef NET_PROXY_PROXY_SERVICE_H_
6 #define NET_PROXY_PROXY_SERVICE_H_ 6 #define NET_PROXY_PROXY_SERVICE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 // hardcoded proxy fallback list (|pac_string|) for every URL. 285 // hardcoded proxy fallback list (|pac_string|) for every URL.
286 // 286 //
287 // |pac_string| is a list of proxy servers, in the format that a PAC script 287 // |pac_string| is a list of proxy servers, in the format that a PAC script
288 // would return it. For example, "PROXY foobar:99; SOCKS fml:2; DIRECT" 288 // would return it. For example, "PROXY foobar:99; SOCKS fml:2; DIRECT"
289 static std::unique_ptr<ProxyService> CreateFixedFromPacResult( 289 static std::unique_ptr<ProxyService> CreateFixedFromPacResult(
290 const std::string& pac_string); 290 const std::string& pac_string);
291 291
292 // Creates a config service appropriate for this platform that fetches the 292 // Creates a config service appropriate for this platform that fetches the
293 // system proxy settings. 293 // system proxy settings.
294 static std::unique_ptr<ProxyConfigService> CreateSystemProxyConfigService( 294 static std::unique_ptr<ProxyConfigService> CreateSystemProxyConfigService(
295 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner, 295 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner);
296 const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner);
297 296
298 // This method should only be used by unit tests. 297 // This method should only be used by unit tests.
299 void set_stall_proxy_auto_config_delay(base::TimeDelta delay) { 298 void set_stall_proxy_auto_config_delay(base::TimeDelta delay) {
300 stall_proxy_auto_config_delay_ = delay; 299 stall_proxy_auto_config_delay_ = delay;
301 } 300 }
302 301
303 // This method should only be used by unit tests. Returns the previously 302 // This method should only be used by unit tests. Returns the previously
304 // active policy. 303 // active policy.
305 static const PacPollPolicy* set_pac_script_poll_policy( 304 static const PacPollPolicy* set_pac_script_poll_policy(
306 const PacPollPolicy* policy); 305 const PacPollPolicy* policy);
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 SanitizeUrlPolicy sanitize_url_policy_; 481 SanitizeUrlPolicy sanitize_url_policy_;
483 482
484 THREAD_CHECKER(thread_checker_); 483 THREAD_CHECKER(thread_checker_);
485 484
486 DISALLOW_COPY_AND_ASSIGN(ProxyService); 485 DISALLOW_COPY_AND_ASSIGN(ProxyService);
487 }; 486 };
488 487
489 } // namespace net 488 } // namespace net
490 489
491 #endif // NET_PROXY_PROXY_SERVICE_H_ 490 #endif // NET_PROXY_PROXY_SERVICE_H_
OLDNEW
« no previous file with comments | « net/proxy/proxy_config_service_linux_unittest.cc ('k') | net/proxy/proxy_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698