Add --headless flag to Windows

headless/BUILD.gn

 # Copyright 2015 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.
 
 import("//build/config/chrome_build.gni")
 import("//headless/headless.gni")
 import("//build/util/process_version.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 import("//tools/grit/grit_rule.gni")
@@ skipping 271 matching lines @@
       "lib/browser/headless_window_parenting_client.h",
       "lib/browser/headless_window_tree_host.cc",
       "lib/browser/headless_window_tree_host.h",
     ]
   }
 
   deps = [
     ":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",
     "//services/service_manager/public/cpp",
     "//third_party/mesa:osmesa",
     "//ui/base",
     "//ui/compositor",
     "//ui/display",
     "//ui/events/devices",
     "//url",
@@ skipping 118 matching lines @@
     ":embedder_mojo_for_testing",
     ":headless_browser_tests_pak",
     "//base",
     "//content/test:test_support",
     "//headless:headless_lib",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }
 
-static_library("headless_shell_lib") {
+static_library("headless_shell_main_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_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",
     ]
   }
 
   configs += [ ":headless_implementation" ]
 }
 
 process_version("version_header") {
   template_file = "public/version.h.in"
   sources = [
     "//build/util/LASTCHANGE",
     "//chrome/VERSION",
   ]
   output = "$target_gen_dir/public/version.h"
 }
 
 executable("headless_example") {
   sources = [
     "app/headless_example.cc",
   ]
 
   deps = [
+    "//content/public/app:both",
     "//headless:headless_shell_lib",
   ]
+
+  if (is_win) {
+    deps += [
+      "//content:sandbox_helper_win",
+      "//sandbox",
+    ]
+  }
 }