Add --headless flag to Windows

headless/BUILD.gn

Index: headless/BUILD.gn
diff --git a/headless/BUILD.gn b/headless/BUILD.gn
index 2d83fadcc35e60c8e30cd7bdae08ed9e04e70247..a958e654197e4eae2a5649d0414c29ac47cf971e 100644
--- a/headless/BUILD.gn
+++ b/headless/BUILD.gn
@@ -18,9 +18,9 @@ config("headless_implementation") {
   }
 }
 
-group("headless") {
+group("headless_lib") {
   deps = [
-    "//headless:headless_lib",
+    "//headless:headless",
   ]
 }
 
@@ -188,7 +188,7 @@ action("gen_devtools_client_api") {
   ]
 }
 
-static_library("headless_lib") {
+component("headless") {
   sources = generated_devtools_api + [
               "lib/browser/headless_browser_context_impl.cc",
               "lib/browser/headless_browser_context_impl.h",
@@ -292,9 +292,6 @@ static_library("headless_lib") {
     "//components/crash/content/browser",
     "//components/security_state/content",
     "//components/security_state/core",
-    "//content/public/app:both",
-    "//content/public/browser",
-    "//content/public/child:child",
     "//content/public/common",
     "//content/public/common:service_names",
     "//net",
@@ -350,9 +347,10 @@ test("headless_unittests") {
   ]
 
   deps = [
-    ":headless_lib",
+    ":headless",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
+    "//net",
     "//testing/gmock",
     "//testing/gtest",
   ]
@@ -427,7 +425,7 @@ test("headless_browsertests") {
     ":headless_browser_tests_pak",
     "//base",
     "//content/test:test_support",
-    "//headless:headless_lib",
+    "//headless:headless",
     "//testing/gmock",
     "//testing/gtest",
   ]
@@ -445,30 +443,46 @@ static_library("headless_shell_lib") {
   ]
 
   deps = [
-    "//headless:headless_lib",
+    ":headless",
+    "//content/public/browser",
+    "//content/public/common",
   ]
 
-  configs += [ ":headless_implementation" ]
+  if (is_win) {
+    deps += [
+      "//content:sandbox_helper_win",
+      "//sandbox",
+    ]
+  }
 }
 
-executable("headless_shell") {
+static_library("headless_shell_child_lib") {
   sources = [
-    "app/headless_shell_main.cc",
+    "app/headless_shell.cc",
+    "app/headless_shell.h",
+    "app/headless_shell_switches.cc",
+    "app/headless_shell_switches.h",
+    "app/shell_navigation_request.cc",
+    "app/shell_navigation_request.h",
+    "public/headless_shell.h",
   ]
 
   deps = [
-    "//headless:headless_shell_lib",
+    ":headless",
+    "//content/public/child:child",
   ]
+}
 
-  if (is_win) {
-    deps += [
-      "//build/win:default_exe_manifest",
-      "//content:sandbox_helper_win",
-      "//sandbox",
-    ]
-  }
+executable("headless_shell") {
+  sources = [
+    "app/headless_shell_main.cc",
+  ]
 
-  configs += [ ":headless_implementation" ]
+  deps = [
+    ":headless_shell_child_lib",
+    ":headless_shell_lib",
+    "//content/public/app:both",
+  ]
 }
 
 process_version("version_header") {
@@ -486,6 +500,8 @@ executable("headless_example") {
   ]
 
   deps = [
-    "//headless:headless_shell_lib",
+    ":headless_shell_child_lib",
+    ":headless_shell_lib",
+    "//content/public/app:both",
   ]
 }