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

Unified Diff: content/shell/browser/shell_url_request_context_getter.h

Issue 651883002: Content Shell: Introduce LayoutTestURLRequestContextGetter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@LayoutTestBrowserMainParts
Patch Set: Fix. Created 6 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 side-by-side diff with in-line comments
Download patch
Index: content/shell/browser/shell_url_request_context_getter.h
diff --git a/content/shell/browser/shell_url_request_context_getter.h b/content/shell/browser/shell_url_request_context_getter.h
index 665c964457387d01a506c37c1dba406da2cdf8a3..3887d38a071fb99ea982bb2aa0aa27a0e3adb5c4 100644
--- a/content/shell/browser/shell_url_request_context_getter.h
+++ b/content/shell/browser/shell_url_request_context_getter.h
@@ -10,6 +10,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "content/public/browser/content_browser_client.h"
+#include "net/proxy/proxy_config_service.h"
#include "net/url_request/url_request_context_getter.h"
#include "net/url_request/url_request_job_factory.h"
@@ -23,6 +24,7 @@ class MappedHostResolver;
class NetworkDelegate;
class NetLog;
class ProxyConfigService;
+class ProxyService;
class URLRequestContextStorage;
}
@@ -44,14 +46,18 @@ class ShellURLRequestContextGetter : public net::URLRequestContextGetter {
virtual scoped_refptr<base::SingleThreadTaskRunner>
GetNetworkTaskRunner() const override;
- // Used by subclasses to create their own implementation of NetworkDelegate.
- virtual net::NetworkDelegate* CreateNetworkDelegate();
net::HostResolver* host_resolver();
protected:
virtual ~ShellURLRequestContextGetter();
+ // Used by subclasses to create their own implementation of NetworkDelegate
+ // and net::ProxyService.
+ virtual net::NetworkDelegate* CreateNetworkDelegate();
+ virtual net::ProxyConfigService* GetProxyConfigService();
+ virtual net::ProxyService* GetProxyService();
+
private:
bool ignore_certificate_errors_;
base::FilePath base_path_;
« no previous file with comments | « content/shell/browser/shell_browser_context.cc ('k') | content/shell/browser/shell_url_request_context_getter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698