diff --git a/headless/BUILD.gn b/headless/BUILD.gn
index 57342a3bc7601..09f2e2fcf2077 100644
--- a/headless/BUILD.gn
+++ b/headless/BUILD.gn
@@ -196,96 +196,98 @@ action("gen_devtools_client_api") {
 }
 
 static_library("headless_lib") {
-  sources = generated_devtools_api + [
-              "app/headless_shell_switches.cc",
-              "app/headless_shell_switches.h",
-              "lib/browser/headless_browser_context_impl.cc",
-              "lib/browser/headless_browser_context_impl.h",
-              "lib/browser/headless_browser_context_options.cc",
-              "lib/browser/headless_browser_context_options.h",
-              "lib/browser/headless_browser_impl.cc",
-              "lib/browser/headless_browser_impl.h",
-              "lib/browser/headless_browser_impl_mac.mm",
-              "lib/browser/headless_browser_main_parts_mac.mm",
-              "lib/browser/headless_browser_main_parts.cc",
-              "lib/browser/headless_browser_main_parts.h",
-              "lib/browser/headless_content_browser_client.cc",
-              "lib/browser/headless_content_browser_client.h",
-              "lib/browser/headless_devtools.cc",
-              "lib/browser/headless_devtools.h",
-              "lib/browser/headless_devtools_client_impl.cc",
-              "lib/browser/headless_devtools_client_impl.h",
-              "lib/browser/headless_devtools_manager_delegate.cc",
-              "lib/browser/headless_devtools_manager_delegate.h",
-              "lib/browser/headless_net_log.cc",
-              "lib/browser/headless_net_log.h",
-              "lib/browser/headless_network_delegate.cc",
-              "lib/browser/headless_network_delegate.h",
-              "lib/browser/headless_permission_manager.cc",
-              "lib/browser/headless_permission_manager.h",
-              "lib/browser/headless_platform_event_source.cc",
-              "lib/browser/headless_platform_event_source.h",
-              "lib/browser/headless_resource_dispatcher_host_delegate.cc",
-              "lib/browser/headless_resource_dispatcher_host_delegate.h",
-              "lib/browser/headless_shell_application_mac.mm",
-              "lib/browser/headless_shell_application_mac.h",
-              "lib/browser/headless_tab_socket_impl.cc",
-              "lib/browser/headless_tab_socket_impl.h",
-              "lib/browser/headless_url_request_context_getter.cc",
-              "lib/browser/headless_url_request_context_getter.h",
-              "lib/browser/headless_web_contents_impl.cc",
-              "lib/browser/headless_web_contents_impl.h",
-              "lib/browser/headless_window_tree_host.h",
-              "lib/headless_crash_reporter_client.cc",
-              "lib/headless_crash_reporter_client.h",
-              "lib/headless_content_client.cc",
-              "lib/headless_content_client.h",
-              "lib/headless_content_main_delegate.cc",
-              "lib/headless_content_main_delegate.h",
-              "lib/renderer/headless_content_renderer_client.cc",
-              "lib/renderer/headless_content_renderer_client.h",
-              "public/headless_browser.cc",
-              "public/headless_browser.h",
-              "public/headless_browser_context.h",
-              "public/headless_devtools_client.h",
-              "public/headless_devtools_target.h",
-              "public/headless_export.h",
-              "public/headless_web_contents.h",
-              "public/internal/message_dispatcher.h",
-              "public/internal/value_conversions.h",
-              "public/util/black_hole_protocol_handler.cc",
-              "public/util/black_hole_protocol_handler.h",
-              "public/util/deterministic_dispatcher.cc",
-              "public/util/deterministic_dispatcher.h",
-              "public/util/deterministic_http_protocol_handler.cc",
-              "public/util/deterministic_http_protocol_handler.h",
-              "public/util/dom_tree_extractor.cc",
-              "public/util/dom_tree_extractor.h",
-              "public/util/error_reporter.cc",
-              "public/util/error_reporter.h",
-              "public/util/expedited_dispatcher.cc",
-              "public/util/expedited_dispatcher.h",
-              "public/util/generic_url_request_job.cc",
-              "public/util/generic_url_request_job.h",
-              "public/util/flat_dom_tree_extractor.cc",
-              "public/util/flat_dom_tree_extractor.h",
-              "public/util/http_url_fetcher.cc",
-              "public/util/http_url_fetcher.h",
-              "public/util/in_memory_protocol_handler.cc",
-              "public/util/in_memory_protocol_handler.h",
-              "public/util/in_memory_request_job.cc",
-              "public/util/in_memory_request_job.h",
-              "public/util/managed_dispatch_url_request_job.cc",
-              "public/util/managed_dispatch_url_request_job.h",
-              "public/util/navigation_request.h",
-              "public/util/testing/generic_url_request_mocks.cc",
-              "public/util/testing/generic_url_request_mocks.h",
-              "public/util/url_fetcher.cc",
-              "public/util/url_fetcher.h",
-              "public/util/url_request_dispatcher.h",
-              "public/util/user_agent.cc",
-              "public/util/user_agent.h",
-            ]
+  sources = [
+    "app/headless_shell_switches.cc",
+    "app/headless_shell_switches.h",
+    "lib/browser/headless_browser_context_impl.cc",
+    "lib/browser/headless_browser_context_impl.h",
+    "lib/browser/headless_browser_context_options.cc",
+    "lib/browser/headless_browser_context_options.h",
+    "lib/browser/headless_browser_impl.cc",
+    "lib/browser/headless_browser_impl.h",
+    "lib/browser/headless_browser_impl_mac.mm",
+    "lib/browser/headless_browser_main_parts.cc",
+    "lib/browser/headless_browser_main_parts.h",
+    "lib/browser/headless_browser_main_parts_mac.mm",
+    "lib/browser/headless_content_browser_client.cc",
+    "lib/browser/headless_content_browser_client.h",
+    "lib/browser/headless_devtools.cc",
+    "lib/browser/headless_devtools.h",
+    "lib/browser/headless_devtools_client_impl.cc",
+    "lib/browser/headless_devtools_client_impl.h",
+    "lib/browser/headless_devtools_manager_delegate.cc",
+    "lib/browser/headless_devtools_manager_delegate.h",
+    "lib/browser/headless_net_log.cc",
+    "lib/browser/headless_net_log.h",
+    "lib/browser/headless_network_delegate.cc",
+    "lib/browser/headless_network_delegate.h",
+    "lib/browser/headless_permission_manager.cc",
+    "lib/browser/headless_permission_manager.h",
+    "lib/browser/headless_platform_event_source.cc",
+    "lib/browser/headless_platform_event_source.h",
+    "lib/browser/headless_resource_dispatcher_host_delegate.cc",
+    "lib/browser/headless_resource_dispatcher_host_delegate.h",
+    "lib/browser/headless_shell_application_mac.h",
+    "lib/browser/headless_shell_application_mac.mm",
+    "lib/browser/headless_tab_socket_impl.cc",
+    "lib/browser/headless_tab_socket_impl.h",
+    "lib/browser/headless_url_request_context_getter.cc",
+    "lib/browser/headless_url_request_context_getter.h",
+    "lib/browser/headless_web_contents_impl.cc",
+    "lib/browser/headless_web_contents_impl.h",
+    "lib/browser/headless_window_tree_host.h",
+    "lib/headless_content_client.cc",
+    "lib/headless_content_client.h",
+    "lib/headless_content_main_delegate.cc",
+    "lib/headless_content_main_delegate.h",
+    "lib/headless_crash_reporter_client.cc",
+    "lib/headless_crash_reporter_client.h",
+    "lib/renderer/headless_content_renderer_client.cc",
+    "lib/renderer/headless_content_renderer_client.h",
+    "public/headless_browser.cc",
+    "public/headless_browser.h",
+    "public/headless_browser_context.h",
+    "public/headless_devtools_client.h",
+    "public/headless_devtools_target.h",
+    "public/headless_export.h",
+    "public/headless_web_contents.h",
+    "public/internal/message_dispatcher.h",
+    "public/internal/value_conversions.h",
+    "public/util/black_hole_protocol_handler.cc",
+    "public/util/black_hole_protocol_handler.h",
+    "public/util/deterministic_dispatcher.cc",
+    "public/util/deterministic_dispatcher.h",
+    "public/util/deterministic_http_protocol_handler.cc",
+    "public/util/deterministic_http_protocol_handler.h",
+    "public/util/dom_tree_extractor.cc",
+    "public/util/dom_tree_extractor.h",
+    "public/util/error_reporter.cc",
+    "public/util/error_reporter.h",
+    "public/util/expedited_dispatcher.cc",
+    "public/util/expedited_dispatcher.h",
+    "public/util/flat_dom_tree_extractor.cc",
+    "public/util/flat_dom_tree_extractor.h",
+    "public/util/generic_url_request_job.cc",
+    "public/util/generic_url_request_job.h",
+    "public/util/http_url_fetcher.cc",
+    "public/util/http_url_fetcher.h",
+    "public/util/in_memory_protocol_handler.cc",
+    "public/util/in_memory_protocol_handler.h",
+    "public/util/in_memory_request_job.cc",
+    "public/util/in_memory_request_job.h",
+    "public/util/managed_dispatch_url_request_job.cc",
+    "public/util/managed_dispatch_url_request_job.h",
+    "public/util/navigation_request.h",
+    "public/util/testing/generic_url_request_mocks.cc",
+    "public/util/testing/generic_url_request_mocks.h",
+    "public/util/url_fetcher.cc",
+    "public/util/url_fetcher.h",
+    "public/util/url_request_dispatcher.h",
+    "public/util/user_agent.cc",
+    "public/util/user_agent.h",
+  ]
+
+  sources += generated_devtools_api
 
   if (use_aura) {
     sources += [