| Index: headless/lib/browser/headless_url_request_context_getter.cc
|
| diff --git a/headless/lib/browser/headless_url_request_context_getter.cc b/headless/lib/browser/headless_url_request_context_getter.cc
|
| index 07b0438cea52cb8787959d992561ec8d44d07763..04a04d5c25ae09d6c786dc3c919740c1dc0eee2f 100644
|
| --- a/headless/lib/browser/headless_url_request_context_getter.cc
|
| +++ b/headless/lib/browser/headless_url_request_context_getter.cc
|
| @@ -5,10 +5,13 @@
|
| #include "headless/lib/browser/headless_url_request_context_getter.h"
|
|
|
| #include <memory>
|
| +#include <utility>
|
| +#include <vector>
|
|
|
| #include "base/memory/ptr_util.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "content/public/browser/browser_thread.h"
|
| +#include "headless/lib/browser/headless_browser_context_options.h"
|
| #include "net/dns/mapped_host_resolver.h"
|
| #include "net/proxy/proxy_service.h"
|
| #include "net/url_request/url_request_context.h"
|
| @@ -22,23 +25,18 @@ HeadlessURLRequestContextGetter::HeadlessURLRequestContextGetter(
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| ProtocolHandlerMap context_protocol_handlers,
|
| content::URLRequestInterceptorScopedVector request_interceptors,
|
| - HeadlessBrowser::Options* options)
|
| + HeadlessBrowserContextOptions* options)
|
| : io_task_runner_(std::move(io_task_runner)),
|
| file_task_runner_(std::move(file_task_runner)),
|
| - user_agent_(options->user_agent),
|
| - host_resolver_rules_(options->host_resolver_rules),
|
| - proxy_server_(options->proxy_server),
|
| + user_agent_(options->user_agent()),
|
| + host_resolver_rules_(options->host_resolver_rules()),
|
| + proxy_server_(options->proxy_server()),
|
| request_interceptors_(std::move(request_interceptors)) {
|
| // Must first be created on the UI thread.
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
| std::swap(protocol_handlers_, *protocol_handlers);
|
| - for (auto& pair : options->protocol_handlers) {
|
| - protocol_handlers_[pair.first] =
|
| - linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
|
| - pair.second.release());
|
| - }
|
| - options->protocol_handlers.clear();
|
| +
|
| for (auto& pair : context_protocol_handlers) {
|
| protocol_handlers_[pair.first] =
|
| linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
|
|
|