| Index: headless/BUILD.gn | 
| diff --git a/headless/BUILD.gn b/headless/BUILD.gn | 
| index 39f8a052fa9181dce4d794e23edefdd0893fec3f..7a509c7f04799dbab4f0fe29a4b343232d50fdff 100644 | 
| --- a/headless/BUILD.gn | 
| +++ b/headless/BUILD.gn | 
| @@ -59,6 +59,74 @@ grit("headless_lib_resources_grit") { | 
| ] | 
| } | 
|  | 
| +generated_devtools_api = [ | 
| +  "$target_gen_dir/public/domains/accessibility.cc", | 
| +  "$target_gen_dir/public/domains/accessibility.h", | 
| +  "$target_gen_dir/public/domains/animation.cc", | 
| +  "$target_gen_dir/public/domains/animation.h", | 
| +  "$target_gen_dir/public/domains/application_cache.cc", | 
| +  "$target_gen_dir/public/domains/application_cache.h", | 
| +  "$target_gen_dir/public/domains/browser.cc", | 
| +  "$target_gen_dir/public/domains/browser.h", | 
| +  "$target_gen_dir/public/domains/cache_storage.cc", | 
| +  "$target_gen_dir/public/domains/cache_storage.h", | 
| +  "$target_gen_dir/public/domains/console.cc", | 
| +  "$target_gen_dir/public/domains/console.h", | 
| +  "$target_gen_dir/public/domains/css.cc", | 
| +  "$target_gen_dir/public/domains/css.h", | 
| +  "$target_gen_dir/public/domains/database.cc", | 
| +  "$target_gen_dir/public/domains/database.h", | 
| +  "$target_gen_dir/public/domains/debugger.cc", | 
| +  "$target_gen_dir/public/domains/debugger.h", | 
| +  "$target_gen_dir/public/domains/device_orientation.cc", | 
| +  "$target_gen_dir/public/domains/device_orientation.h", | 
| +  "$target_gen_dir/public/domains/dom_debugger.cc", | 
| +  "$target_gen_dir/public/domains/dom_debugger.h", | 
| +  "$target_gen_dir/public/domains/dom.cc", | 
| +  "$target_gen_dir/public/domains/dom.h", | 
| +  "$target_gen_dir/public/domains/dom_storage.cc", | 
| +  "$target_gen_dir/public/domains/dom_storage.h", | 
| +  "$target_gen_dir/public/domains/emulation.cc", | 
| +  "$target_gen_dir/public/domains/emulation.h", | 
| +  "$target_gen_dir/public/domains/heap_profiler.cc", | 
| +  "$target_gen_dir/public/domains/heap_profiler.h", | 
| +  "$target_gen_dir/public/domains/indexeddb.cc", | 
| +  "$target_gen_dir/public/domains/indexeddb.h", | 
| +  "$target_gen_dir/public/domains/input.cc", | 
| +  "$target_gen_dir/public/domains/input.h", | 
| +  "$target_gen_dir/public/domains/inspector.cc", | 
| +  "$target_gen_dir/public/domains/inspector.h", | 
| +  "$target_gen_dir/public/domains/io.cc", | 
| +  "$target_gen_dir/public/domains/io.h", | 
| +  "$target_gen_dir/public/domains/layer_tree.cc", | 
| +  "$target_gen_dir/public/domains/layer_tree.h", | 
| +  "$target_gen_dir/public/domains/log.cc", | 
| +  "$target_gen_dir/public/domains/log.h", | 
| +  "$target_gen_dir/public/domains/memory.cc", | 
| +  "$target_gen_dir/public/domains/memory.h", | 
| +  "$target_gen_dir/public/domains/network.cc", | 
| +  "$target_gen_dir/public/domains/network.h", | 
| +  "$target_gen_dir/public/domains/page.cc", | 
| +  "$target_gen_dir/public/domains/page.h", | 
| +  "$target_gen_dir/public/domains/profiler.cc", | 
| +  "$target_gen_dir/public/domains/profiler.h", | 
| +  "$target_gen_dir/public/domains/rendering.cc", | 
| +  "$target_gen_dir/public/domains/rendering.h", | 
| +  "$target_gen_dir/public/domains/runtime.cc", | 
| +  "$target_gen_dir/public/domains/runtime.h", | 
| +  "$target_gen_dir/public/domains/security.cc", | 
| +  "$target_gen_dir/public/domains/security.h", | 
| +  "$target_gen_dir/public/domains/service_worker.cc", | 
| +  "$target_gen_dir/public/domains/service_worker.h", | 
| +  "$target_gen_dir/public/domains/tracing.cc", | 
| +  "$target_gen_dir/public/domains/tracing.h", | 
| +  "$target_gen_dir/public/domains/type_conversions.h", | 
| +  "$target_gen_dir/public/domains/types.cc", | 
| +  "$target_gen_dir/public/domains/types.h", | 
| +  "$target_gen_dir/public/domains/worker.cc", | 
| +  "$target_gen_dir/public/domains/worker.h", | 
| +] | 
| + | 
| action("gen_devtools_client_api") { | 
| script = "//headless/lib/browser/client_api_generator.py" | 
| deps = [ | 
| @@ -68,73 +136,7 @@ action("gen_devtools_client_api") { | 
| "$root_gen_dir/blink/core/inspector/protocol.json", | 
| ] | 
|  | 
| -  outputs = [ | 
| -    "$target_gen_dir/public/domains/accessibility.cc", | 
| -    "$target_gen_dir/public/domains/accessibility.h", | 
| -    "$target_gen_dir/public/domains/animation.cc", | 
| -    "$target_gen_dir/public/domains/animation.h", | 
| -    "$target_gen_dir/public/domains/application_cache.cc", | 
| -    "$target_gen_dir/public/domains/application_cache.h", | 
| -    "$target_gen_dir/public/domains/browser.cc", | 
| -    "$target_gen_dir/public/domains/browser.h", | 
| -    "$target_gen_dir/public/domains/cache_storage.cc", | 
| -    "$target_gen_dir/public/domains/cache_storage.h", | 
| -    "$target_gen_dir/public/domains/console.cc", | 
| -    "$target_gen_dir/public/domains/console.h", | 
| -    "$target_gen_dir/public/domains/css.cc", | 
| -    "$target_gen_dir/public/domains/css.h", | 
| -    "$target_gen_dir/public/domains/database.cc", | 
| -    "$target_gen_dir/public/domains/database.h", | 
| -    "$target_gen_dir/public/domains/debugger.cc", | 
| -    "$target_gen_dir/public/domains/debugger.h", | 
| -    "$target_gen_dir/public/domains/device_orientation.cc", | 
| -    "$target_gen_dir/public/domains/device_orientation.h", | 
| -    "$target_gen_dir/public/domains/dom_debugger.cc", | 
| -    "$target_gen_dir/public/domains/dom_debugger.h", | 
| -    "$target_gen_dir/public/domains/dom.cc", | 
| -    "$target_gen_dir/public/domains/dom.h", | 
| -    "$target_gen_dir/public/domains/dom_storage.cc", | 
| -    "$target_gen_dir/public/domains/dom_storage.h", | 
| -    "$target_gen_dir/public/domains/emulation.cc", | 
| -    "$target_gen_dir/public/domains/emulation.h", | 
| -    "$target_gen_dir/public/domains/heap_profiler.cc", | 
| -    "$target_gen_dir/public/domains/heap_profiler.h", | 
| -    "$target_gen_dir/public/domains/indexeddb.cc", | 
| -    "$target_gen_dir/public/domains/indexeddb.h", | 
| -    "$target_gen_dir/public/domains/input.cc", | 
| -    "$target_gen_dir/public/domains/input.h", | 
| -    "$target_gen_dir/public/domains/inspector.cc", | 
| -    "$target_gen_dir/public/domains/inspector.h", | 
| -    "$target_gen_dir/public/domains/io.cc", | 
| -    "$target_gen_dir/public/domains/io.h", | 
| -    "$target_gen_dir/public/domains/layer_tree.cc", | 
| -    "$target_gen_dir/public/domains/layer_tree.h", | 
| -    "$target_gen_dir/public/domains/log.cc", | 
| -    "$target_gen_dir/public/domains/log.h", | 
| -    "$target_gen_dir/public/domains/memory.cc", | 
| -    "$target_gen_dir/public/domains/memory.h", | 
| -    "$target_gen_dir/public/domains/network.cc", | 
| -    "$target_gen_dir/public/domains/network.h", | 
| -    "$target_gen_dir/public/domains/page.cc", | 
| -    "$target_gen_dir/public/domains/page.h", | 
| -    "$target_gen_dir/public/domains/profiler.cc", | 
| -    "$target_gen_dir/public/domains/profiler.h", | 
| -    "$target_gen_dir/public/domains/rendering.cc", | 
| -    "$target_gen_dir/public/domains/rendering.h", | 
| -    "$target_gen_dir/public/domains/runtime.cc", | 
| -    "$target_gen_dir/public/domains/runtime.h", | 
| -    "$target_gen_dir/public/domains/security.cc", | 
| -    "$target_gen_dir/public/domains/security.h", | 
| -    "$target_gen_dir/public/domains/service_worker.cc", | 
| -    "$target_gen_dir/public/domains/service_worker.h", | 
| -    "$target_gen_dir/public/domains/tracing.cc", | 
| -    "$target_gen_dir/public/domains/tracing.h", | 
| -    "$target_gen_dir/public/domains/type_conversions.h", | 
| -    "$target_gen_dir/public/domains/types.cc", | 
| -    "$target_gen_dir/public/domains/types.h", | 
| -    "$target_gen_dir/public/domains/worker.cc", | 
| -    "$target_gen_dir/public/domains/worker.h", | 
| -  ] | 
| +  outputs = generated_devtools_api | 
|  | 
| sources = [ | 
| "lib/browser/domain_cc.template", | 
| @@ -153,123 +155,60 @@ action("gen_devtools_client_api") { | 
| } | 
|  | 
| static_library("headless_lib") { | 
| -  sources = [ | 
| -    "$target_gen_dir/public/domains/accessibility.cc", | 
| -    "$target_gen_dir/public/domains/accessibility.h", | 
| -    "$target_gen_dir/public/domains/animation.cc", | 
| -    "$target_gen_dir/public/domains/animation.h", | 
| -    "$target_gen_dir/public/domains/application_cache.cc", | 
| -    "$target_gen_dir/public/domains/application_cache.h", | 
| -    "$target_gen_dir/public/domains/browser.cc", | 
| -    "$target_gen_dir/public/domains/browser.h", | 
| -    "$target_gen_dir/public/domains/cache_storage.cc", | 
| -    "$target_gen_dir/public/domains/cache_storage.h", | 
| -    "$target_gen_dir/public/domains/console.cc", | 
| -    "$target_gen_dir/public/domains/console.h", | 
| -    "$target_gen_dir/public/domains/css.cc", | 
| -    "$target_gen_dir/public/domains/css.h", | 
| -    "$target_gen_dir/public/domains/database.cc", | 
| -    "$target_gen_dir/public/domains/database.h", | 
| -    "$target_gen_dir/public/domains/debugger.cc", | 
| -    "$target_gen_dir/public/domains/debugger.h", | 
| -    "$target_gen_dir/public/domains/device_orientation.cc", | 
| -    "$target_gen_dir/public/domains/device_orientation.h", | 
| -    "$target_gen_dir/public/domains/dom.cc", | 
| -    "$target_gen_dir/public/domains/dom.h", | 
| -    "$target_gen_dir/public/domains/dom_debugger.cc", | 
| -    "$target_gen_dir/public/domains/dom_debugger.h", | 
| -    "$target_gen_dir/public/domains/dom_storage.cc", | 
| -    "$target_gen_dir/public/domains/dom_storage.h", | 
| -    "$target_gen_dir/public/domains/emulation.cc", | 
| -    "$target_gen_dir/public/domains/emulation.h", | 
| -    "$target_gen_dir/public/domains/heap_profiler.cc", | 
| -    "$target_gen_dir/public/domains/heap_profiler.h", | 
| -    "$target_gen_dir/public/domains/indexeddb.cc", | 
| -    "$target_gen_dir/public/domains/indexeddb.h", | 
| -    "$target_gen_dir/public/domains/input.cc", | 
| -    "$target_gen_dir/public/domains/input.h", | 
| -    "$target_gen_dir/public/domains/inspector.cc", | 
| -    "$target_gen_dir/public/domains/inspector.h", | 
| -    "$target_gen_dir/public/domains/io.cc", | 
| -    "$target_gen_dir/public/domains/io.h", | 
| -    "$target_gen_dir/public/domains/layer_tree.cc", | 
| -    "$target_gen_dir/public/domains/layer_tree.h", | 
| -    "$target_gen_dir/public/domains/log.cc", | 
| -    "$target_gen_dir/public/domains/log.h", | 
| -    "$target_gen_dir/public/domains/memory.cc", | 
| -    "$target_gen_dir/public/domains/memory.h", | 
| -    "$target_gen_dir/public/domains/network.cc", | 
| -    "$target_gen_dir/public/domains/network.h", | 
| -    "$target_gen_dir/public/domains/page.cc", | 
| -    "$target_gen_dir/public/domains/page.h", | 
| -    "$target_gen_dir/public/domains/profiler.cc", | 
| -    "$target_gen_dir/public/domains/profiler.h", | 
| -    "$target_gen_dir/public/domains/rendering.cc", | 
| -    "$target_gen_dir/public/domains/rendering.h", | 
| -    "$target_gen_dir/public/domains/runtime.cc", | 
| -    "$target_gen_dir/public/domains/runtime.h", | 
| -    "$target_gen_dir/public/domains/security.cc", | 
| -    "$target_gen_dir/public/domains/security.h", | 
| -    "$target_gen_dir/public/domains/service_worker.cc", | 
| -    "$target_gen_dir/public/domains/service_worker.h", | 
| -    "$target_gen_dir/public/domains/tracing.cc", | 
| -    "$target_gen_dir/public/domains/tracing.h", | 
| -    "$target_gen_dir/public/domains/type_conversions.h", | 
| -    "$target_gen_dir/public/domains/types.cc", | 
| -    "$target_gen_dir/public/domains/types.h", | 
| -    "$target_gen_dir/public/domains/worker.cc", | 
| -    "$target_gen_dir/public/domains/worker.h", | 
| -    "lib/browser/headless_browser_context_impl.cc", | 
| -    "lib/browser/headless_browser_context_impl.h", | 
| -    "lib/browser/headless_browser_impl.cc", | 
| -    "lib/browser/headless_browser_impl.h", | 
| -    "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_screen.cc", | 
| -    "lib/browser/headless_screen.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_client.cc", | 
| -    "lib/browser/headless_window_tree_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", | 
| -    "lib/utility/headless_content_utility_client.cc", | 
| -    "lib/utility/headless_content_utility_client.h", | 
| -    "public/headless_browser.cc", | 
| -    "public/headless_browser.h", | 
| -    "public/headless_browser_context.h", | 
| -    "public/headless_devtools_client.h", | 
| -    "public/headless_devtools_host.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/error_reporter.cc", | 
| -    "public/util/error_reporter.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/user_agent.cc", | 
| -    "public/util/user_agent.h", | 
| -  ] | 
| +  sources = generated_devtools_api + [ | 
| +              "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_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_screen.cc", | 
| +              "lib/browser/headless_screen.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_client.cc", | 
| +              "lib/browser/headless_window_tree_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", | 
| +              "lib/utility/headless_content_utility_client.cc", | 
| +              "lib/utility/headless_content_utility_client.h", | 
| +              "public/headless_browser.cc", | 
| +              "public/headless_browser.h", | 
| +              "public/headless_browser_context.h", | 
| +              "public/headless_devtools_client.h", | 
| +              "public/headless_devtools_host.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/error_reporter.cc", | 
| +              "public/util/error_reporter.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/user_agent.cc", | 
| +              "public/util/user_agent.h", | 
| +            ] | 
|  | 
| deps = [ | 
| ":gen_devtools_client_api", | 
|  |