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",

[Sami, 2017/03/22 19:46:25]

Why remove these? Only content/public/child seems unused.

[dvallet, 2017/03/27 05:59:50]

The issue is that chrome in windows has restrictions on what dependencies can be
pulled for chrome_main and chrome_child DLLs, in this case fro chrome main there
cannot be any content/browser dependencies. 
These are moved to headless_shell_lib and headless_shell_child_lib. 
The app:both dependency is moved to the actual executables that need both child
and main dependencies.

-    "//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 41 matching lines @@
     "public/util/testing/fake_managed_dispatch_url_request_job.h",
   ]
 
   deps = [
     ":headless_lib",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
+
+  configs += [ ":headless_implementation" ]
 }
 
 mojom("embedder_mojo_for_testing") {
   sources = [
     "lib/embedder_test.mojom",
   ]
 }
 
 grit("headless_browsertest_resources_grit") {
   source = "lib/headless_browsertest_resources.grd"
@@ skipping 55 matching lines @@
 
   deps = [
     ":embedder_mojo_for_testing",
     ":headless_browser_tests_pak",
     "//base",
     "//content/test:test_support",
     "//headless:headless_lib",
     "//testing/gmock",
     "//testing/gtest",
   ]
+
+  configs += [ ":headless_implementation" ]

[Sami, 2017/03/22 19:46:25]

I don't think this should be on the testing target -- it's testing the
implementation defined by the library itself.

[dvallet, 2017/03/27 05:59:50]

Done

+}
+
+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_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_lib",
+    "//headless:headless_shell_child_lib",
+    "//headless:headless_shell_main_lib",
   ]
 
+  if (is_win) {
+    deps += [
+      "//content:sandbox_helper_win",
+      "//sandbox",
+    ]
+  }
+
   configs += [ ":headless_implementation" ]
 }
 
 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",
+    ]
+  }
+
+  configs += [ ":headless_implementation" ]

[Sami, 2017/03/22 19:46:25]

Also this seems unnecessary -- the example isn't implementing any headless
symbols.

[dvallet, 2017/03/27 05:59:50]

Done.

 }