| Index: headless/lib/browser/headless_url_request_context_getter.h
|
| diff --git a/blimp/engine/app/blimp_url_request_context_getter.h b/headless/lib/browser/headless_url_request_context_getter.h
|
| similarity index 50%
|
| copy from blimp/engine/app/blimp_url_request_context_getter.h
|
| copy to headless/lib/browser/headless_url_request_context_getter.h
|
| index e9806e66fb22c6349d082dc15b344ca51d6008cb..cfd927b1071a5270606adb42e74f00f15d032569 100644
|
| --- a/blimp/engine/app/blimp_url_request_context_getter.h
|
| +++ b/headless/lib/browser/headless_url_request_context_getter.h
|
| @@ -2,22 +2,27 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef BLIMP_ENGINE_APP_BLIMP_URL_REQUEST_CONTEXT_GETTER_H_
|
| -#define BLIMP_ENGINE_APP_BLIMP_URL_REQUEST_CONTEXT_GETTER_H_
|
| +#ifndef HEADLESS_LIB_BROWSER_HEADLESS_URL_REQUEST_CONTEXT_GETTER_H_
|
| +#define HEADLESS_LIB_BROWSER_HEADLESS_URL_REQUEST_CONTEXT_GETTER_H_
|
|
|
| +#include "base/compiler_specific.h"
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| +#include "headless/public/headless_browser.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"
|
|
|
| namespace base {
|
| class MessageLoop;
|
| -class SingleThreadTaskRunner;
|
| }
|
|
|
| namespace net {
|
| class HostResolver;
|
| +class MappedHostResolver;
|
| class NetworkDelegate;
|
| class NetLog;
|
| class ProxyConfigService;
|
| @@ -25,43 +30,41 @@ class ProxyService;
|
| class URLRequestContextStorage;
|
| }
|
|
|
| -namespace blimp {
|
| -namespace engine {
|
| +namespace headless {
|
|
|
| -class BlimpURLRequestContextGetter : public net::URLRequestContextGetter {
|
| +class HeadlessURLRequestContextGetter : public net::URLRequestContextGetter {
|
| public:
|
| - // The content of |protocol_handlers| is is swapped into the new instance.
|
| - BlimpURLRequestContextGetter(
|
| + HeadlessURLRequestContextGetter(
|
| bool ignore_certificate_errors,
|
| const base::FilePath& base_path,
|
| - const scoped_refptr<base::SingleThreadTaskRunner>& io_loop_task_runner,
|
| - const scoped_refptr<base::SingleThreadTaskRunner>& file_loop_task_runner,
|
| + scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
|
| + scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| content::URLRequestInterceptorScopedVector request_interceptors,
|
| - net::NetLog* net_log);
|
| + net::NetLog* net_log,
|
| + const HeadlessBrowser::Options& options);
|
|
|
| - // net::URLRequestContextGetter implementation.
|
| + // net::URLRequestContextGetter implementation:
|
| net::URLRequestContext* GetURLRequestContext() override;
|
| scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
|
| const override;
|
|
|
| - net::HostResolver* host_resolver();
|
| + net::HostResolver* host_resolver() const;
|
|
|
| protected:
|
| - ~BlimpURLRequestContextGetter() override;
|
| + ~HeadlessURLRequestContextGetter() override;
|
|
|
| - // Used by subclasses to create their own implementation of NetworkDelegate
|
| - // and net::ProxyService.
|
| - virtual scoped_ptr<net::NetworkDelegate> CreateNetworkDelegate();
|
| - virtual scoped_ptr<net::ProxyConfigService> GetProxyConfigService();
|
| - virtual scoped_ptr<net::ProxyService> GetProxyService();
|
| + scoped_ptr<net::NetworkDelegate> CreateNetworkDelegate();
|
| + scoped_ptr<net::ProxyConfigService> GetProxyConfigService();
|
| + scoped_ptr<net::ProxyService> GetProxyService();
|
|
|
| private:
|
| bool ignore_certificate_errors_;
|
| base::FilePath base_path_;
|
| - scoped_refptr<base::SingleThreadTaskRunner> io_loop_task_runner_;
|
| - scoped_refptr<base::SingleThreadTaskRunner> file_loop_task_runner_;
|
| + scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
|
| + scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
|
| net::NetLog* net_log_;
|
| + HeadlessBrowser::Options options_;
|
|
|
| scoped_ptr<net::ProxyConfigService> proxy_config_service_;
|
| scoped_ptr<net::NetworkDelegate> network_delegate_;
|
| @@ -70,10 +73,9 @@ class BlimpURLRequestContextGetter : public net::URLRequestContextGetter {
|
| content::ProtocolHandlerMap protocol_handlers_;
|
| content::URLRequestInterceptorScopedVector request_interceptors_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(BlimpURLRequestContextGetter);
|
| + DISALLOW_COPY_AND_ASSIGN(HeadlessURLRequestContextGetter);
|
| };
|
|
|
| -} // namespace engine
|
| -} // namespace blimp
|
| +} // namespace headless
|
|
|
| -#endif // BLIMP_ENGINE_APP_BLIMP_URL_REQUEST_CONTEXT_GETTER_H_
|
| +#endif // HEADLESS_LIB_BROWSER_HEADLESS_URL_REQUEST_CONTEXT_GETTER_H_
|
|
|