Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / shell / browser / shell_url_request_context_getter.h

diff --git a/src/content/shell/browser/shell_url_request_context_getter.h b/src/content/shell/browser/shell_url_request_context_getter.h
index fefe1f7..7a83ba0 100644 (file)
--- a/src/content/shell/browser/shell_url_request_context_getter.h
+++ b/src/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;
 }
 
@@ -40,14 +42,20 @@ class ShellURLRequestContextGetter : public net::URLRequestContextGetter {
       net::NetLog* net_log);
 
   // net::URLRequestContextGetter implementation.
-  virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
-  virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetNetworkTaskRunner() const OVERRIDE;
+  net::URLRequestContext* GetURLRequestContext() override;
+  scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
+      const override;
 
   net::HostResolver* host_resolver();
 
  protected:
-  virtual ~ShellURLRequestContextGetter();
+  ~ShellURLRequestContextGetter() override;
+
+  // 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_;