Add --headless flag to Windows

headless/BUILD.gn

Index: headless/BUILD.gn
diff --git a/headless/BUILD.gn b/headless/BUILD.gn
index 2d83fadcc35e60c8e30cd7bdae08ed9e04e70247..9e65206f0a7f4d194fbefbf97e057d707b6a1603 100644
--- a/headless/BUILD.gn
+++ b/headless/BUILD.gn
@@ -289,12 +289,10 @@ static_library("headless_lib") {
     ":gen_devtools_client_api",
     ":version_header",
     "//base",
+    "//components/crash/content/app:app",
     "//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",
@@ -433,7 +431,7 @@ test("headless_browsertests") {
   ]
 }
 
-static_library("headless_shell_lib") {
+static_library("headless_shell_main_lib") {
   sources = [
     "app/headless_shell.cc",
     "app/headless_shell.h",
@@ -445,25 +443,68 @@ static_library("headless_shell_lib") {
   ]
 
   deps = [
-    "//headless:headless_lib",
+    ":headless_lib",
+    "//content/public/browser",
+    "//content/public/common",
   ]
 
   configs += [ ":headless_implementation" ]
 }
 
+static_library("headless_shell_child_lib") {
+  sources = [
+    "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_lib",
+    "//content/public/child:child",
+  ]
+}
+
+static_library("headless_shell_lib") {
+  sources = [
+    "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_child_lib",

[alex clarke (OOO till 29th), 2017/03/20 08:41:29]

Does the linker not complain about this? app/headless_shell.cc etc seem to be
defined twice. 

[dvallet, 2017/03/22 07:14:17]

It doesn't. I was thinking of adding all the dependencies again, but this worked
and it seems easier to maintain.
 
Also the sources dependencies are still needed, since if not weird things happen
when changing the code.

+    "//headless:headless_shell_main_lib",
+  ]
+
+  if (is_win) {
+    deps += [
+      "//content:sandbox_helper_win",
+      "//sandbox",
+    ]
+  }
+}
+
 executable("headless_shell") {
   sources = [
     "app/headless_shell_main.cc",
   ]
 
   deps = [
-    "//headless:headless_shell_lib",
+    ":headless_shell_lib",
+    "//content/public/app:both",
   ]
 
   if (is_win) {
     deps += [
       "//build/win:default_exe_manifest",
-      "//content:sandbox_helper_win",
       "//sandbox",
     ]
   }
@@ -486,6 +527,14 @@ executable("headless_example") {
   ]
 
   deps = [
+    "//content/public/app:both",
     "//headless:headless_shell_lib",
   ]
+
+  if (is_win) {
+    deps += [
+      "//content:sandbox_helper_win",
+      "//sandbox",
+    ]
+  }
 }