[headless] Remove default browser context.

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 <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"
 #include "net/url_request/url_request_context_builder.h"
 
 namespace headless {
 
 HeadlessURLRequestContextGetter::HeadlessURLRequestContextGetter(
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
     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);

[Sami, 2016/08/03 11:20:31]

We still need to apply |protocol_handlers| I think. I don't think they're used
for anything at the moment but it would be weird to just drop them on the floor.

[altimin, 2016/08/03 11:54:10]

My bad. Fixed.

-  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>(
             pair.second.release());
   }
   context_protocol_handlers.clear();
 
   // 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().
@@ skipping 57 matching lines @@
 HeadlessURLRequestContextGetter::GetNetworkTaskRunner() const {
   return content::BrowserThread::GetTaskRunnerForThread(
       content::BrowserThread::IO);
 }
 
 net::HostResolver* HeadlessURLRequestContextGetter::host_resolver() const {
   return url_request_context_->host_resolver();
 }
 
 }  // namespace headless