headless: Make HeadlessBrowser::Options move-only

headless/lib/browser/headless_url_request_context_getter.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "headless/lib/browser/headless_url_request_context_getter.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 40 matching lines @@
 }  // namespace
 
 HeadlessURLRequestContextGetter::HeadlessURLRequestContextGetter(
     bool ignore_certificate_errors,
     const base::FilePath& base_path,
     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,
-    const HeadlessBrowser::Options& options)
+    HeadlessBrowser::Options* options)
     : ignore_certificate_errors_(ignore_certificate_errors),
       base_path_(base_path),
       io_task_runner_(std::move(io_task_runner)),
       file_task_runner_(std::move(file_task_runner)),
       net_log_(net_log),
-      options_(options),
+      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);
 
   // We must create the proxy config service on the UI loop on Linux because it
   // must synchronously run on the glib message loop. This will be passed to
   // the URLRequestContextStorage on the IO thread in GetURLRequestContext().
-  if (options_.proxy_server.IsEmpty())
+  if (proxy_server_.IsEmpty())
     proxy_config_service_ = GetProxyConfigService();
 }
 
 HeadlessURLRequestContextGetter::~HeadlessURLRequestContextGetter() {}
 
 std::unique_ptr<net::NetworkDelegate>
 HeadlessURLRequestContextGetter::CreateNetworkDelegate() {
   return nullptr;
 }
 
 std::unique_ptr<net::ProxyConfigService>
 HeadlessURLRequestContextGetter::GetProxyConfigService() {
   return net::ProxyService::CreateSystemProxyConfigService(io_task_runner_,
                                                            file_task_runner_);
 }
 
 std::unique_ptr<net::ProxyService>
 HeadlessURLRequestContextGetter::GetProxyService() {
-  if (!options_.proxy_server.IsEmpty())
-    return net::ProxyService::CreateFixed(options_.proxy_server.ToString());
+  if (!proxy_server_.IsEmpty())
+    return net::ProxyService::CreateFixed(proxy_server_.ToString());
   return net::ProxyService::CreateUsingSystemProxyResolver(
       std::move(proxy_config_service_), 0, url_request_context_->net_log());
 }
 
 net::URLRequestContext*
 HeadlessURLRequestContextGetter::GetURLRequestContext() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   if (!url_request_context_) {
     url_request_context_.reset(new net::URLRequestContext());
     url_request_context_->set_net_log(net_log_);
     network_delegate_ = CreateNetworkDelegate();
     url_request_context_->set_network_delegate(network_delegate_.get());
     storage_.reset(
         new net::URLRequestContextStorage(url_request_context_.get()));
     storage_->set_cookie_store(
         content::CreateCookieStore(content::CookieStoreConfig()));
     storage_->set_channel_id_service(base::WrapUnique(
         new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr),
                                   base::WorkerPool::GetTaskRunner(true))));
     // TODO(skyostil): Make language settings configurable.
     storage_->set_http_user_agent_settings(base::WrapUnique(
-        new net::StaticHttpUserAgentSettings("en-us,en", options_.user_agent)));
+        new net::StaticHttpUserAgentSettings("en-us,en", user_agent_)));
 
     std::unique_ptr<net::HostResolver> host_resolver(
         net::HostResolver::CreateDefaultResolver(
             url_request_context_->net_log()));
 
     storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
     storage_->set_transport_security_state(
         base::WrapUnique(new net::TransportSecurityState));
     storage_->set_proxy_service(GetProxyService());
     storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
@@ skipping 20 matching lines @@
         url_request_context_->proxy_service();
     network_session_params.ssl_config_service =
         url_request_context_->ssl_config_service();
     network_session_params.http_auth_handler_factory =
         url_request_context_->http_auth_handler_factory();
     network_session_params.http_server_properties =
         url_request_context_->http_server_properties();
     network_session_params.net_log = url_request_context_->net_log();
     network_session_params.ignore_certificate_errors =
         ignore_certificate_errors_;
-    if (!options_.host_resolver_rules.empty()) {
+    if (!host_resolver_rules_.empty()) {
       std::unique_ptr<net::MappedHostResolver> mapped_host_resolver(
           new net::MappedHostResolver(std::move(host_resolver)));
-      mapped_host_resolver->SetRulesFromString(options_.host_resolver_rules);
+      mapped_host_resolver->SetRulesFromString(host_resolver_rules_);
       host_resolver = std::move(mapped_host_resolver);
     }
 
     // Give |storage_| ownership at the end in case it's |mapped_host_resolver|.
     storage_->set_host_resolver(std::move(host_resolver));
     network_session_params.host_resolver =
         url_request_context_->host_resolver();
 
     storage_->set_http_network_session(
         base::WrapUnique(new net::HttpNetworkSession(network_session_params)));
@@ skipping 37 matching lines @@
 HeadlessURLRequestContextGetter::GetNetworkTaskRunner() const {
   return content::BrowserThread::GetMessageLoopProxyForThread(
       content::BrowserThread::IO);
 }
 
 net::HostResolver* HeadlessURLRequestContextGetter::host_resolver() const {
   return url_request_context_->host_resolver();
 }
 
 }  // namespace headless