Revert of 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("//printing/features/features.gni")
 import("//testing/test.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/grit/repack.gni")
 
 config("headless_implementation") {
   defines = [ "HEADLESS_IMPLEMENTATION" ]
 
   if (headless_use_embedded_resources) {
     defines += [ "HEADLESS_USE_EMBEDDED_RESOURCES" ]
   }
 }
 
-group("headless_lib") {
+group("headless") {
   deps = [
-    "//headless:headless",
+    "//headless:headless_lib",
   ]
 }
 
 repack("pak") {
   sources = [
     "$root_gen_dir/blink/public/resources/blink_image_resources_100_percent.pak",
     "$root_gen_dir/blink/public/resources/blink_resources.pak",
     "$root_gen_dir/components/strings/components_strings_en-US.pak",
     "$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
     "$root_gen_dir/content/app/strings/content_strings_en-US.pak",
@@ skipping 159 matching lines @@
   ]
 
   args = [
     "--protocol",
     rebase_path(inputs[0], root_build_dir),
     "--output_dir",
     rebase_path(target_gen_dir) + "/public",
   ]
 }
 
-component("headless") {
+static_library("headless_lib") {
   sources = generated_devtools_api + [
               "app/headless_shell_switches.cc",
               "app/headless_shell_switches.h",
               "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_impl_mac.mm",
@@ skipping 21 matching lines @@
               "lib/browser/headless_tab_socket_impl.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_host.h",
               "lib/headless_crash_reporter_client.cc",
               "lib/headless_crash_reporter_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",
               "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",
@@ skipping 60 matching lines @@
     "//net",
   ]
 
   deps = [
     ":gen_devtools_client_api",
     ":tab_socket",
     ":version_header",
     "//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",
     "//services/service_manager/public/cpp",
     "//third_party/mesa:osmesa",
     "//ui/base",
     "//ui/compositor",
     "//ui/display",
     "//ui/events/devices",
     "//url",
   ]
 
-  if (is_component_build) {
-    sources += [
-      "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",
-    ]
-
-    if (enable_basic_printing) {
-      deps += [
-        "//components/printing/browser",
-        "//components/printing/renderer",
-      ]
-    }
-  }
-
   if (is_mac) {
     deps += [ ":mac_helpers" ]
   } else {
     deps += [ "//ui/aura" ]
   }
 
+  if (enable_basic_printing) {
+    deps += [
+      "//components/printing/browser",
+      "//components/printing/renderer",
+    ]
+  }
+
   if (headless_use_embedded_resources) {
     deps += [ ":embed_resources" ]
     sources += [
       "$root_gen_dir/headless/embedded_resource_pak.cc",
       "$root_gen_dir/headless/embedded_resource_pak.h",
     ]
   } else {
     deps += [ ":pak" ]
   }
 
   if (use_ozone) {
     deps += [ "//ui/ozone" ]
   }
+
   configs += [ ":headless_implementation" ]
 }
 
-# Headless renderer is a convenience source set that includes headless classes
-# that depend on the reenderer. These are not added in case of a component build
-# since in that case they are already included in the headless component.
-source_set("headless_renderer") {
-  deps = [
-    ":headless",
-  ]
-  if (!is_component_build) {
-    sources = [
-      "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",
-    ]
-    deps += [ "//ui/base" ]
-    if (enable_basic_printing) {
-      deps += [
-        "//components/printing/browser",
-        "//components/printing/renderer",
-      ]
-    }
-    configs += [ ":headless_implementation" ]
-  }
-}
-
 group("headless_tests") {
   testonly = true
 
   deps = [
     ":headless_browsertests",
     ":headless_example",
     ":headless_unittests",
   ]
 }
 
 test("headless_unittests") {
   sources = [
     "public/domains/types_unittest.cc",
     "public/util/deterministic_dispatcher_test.cc",
     "public/util/error_reporter_unittest.cc",
     "public/util/expedited_dispatcher_test.cc",
     "public/util/generic_url_request_job_test.cc",
     "public/util/testing/fake_managed_dispatch_url_request_job.cc",
     "public/util/testing/fake_managed_dispatch_url_request_job.h",
   ]
 
   deps = [
-    ":headless",
+    ":headless_lib",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }
 
 mojom("embedder_mojo_for_testing") {
   sources = [
     "lib/embedder_test.mojom",
@@ skipping 73 matching lines @@
 
   if (is_mac) {
     data += [ "$root_out_dir/Helpers/crashpad_handler" ]
   }
 
   defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
 
   deps = [
     ":embedder_mojo_for_testing",
     ":headless_browser_tests_pak",
-    ":headless_renderer",
     "//base",
     "//content/test:test_support",
+    "//headless:headless_lib",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }
 
-# Headless library with only browser dependencies. This is used when no child
-# dependencies are needed in the target (e.g. chrome:main_dll).
-static_library("headless_shell_browser_lib") {
-  if (is_multi_dll_chrome) {
-    defines = [ "CHROME_MULTIPLE_DLL_BROWSER" ]
-  }
-
+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",
-    "lib/headless_content_main_delegate.cc",
-    "lib/headless_content_main_delegate.h",
-    "public/headless_shell.h",
-  ]
-
-  deps = [
-    ":headless",
-    "//content/public/browser",
-    "//content/public/common",
-  ]
-
-  if (is_win) {
-    deps += [
-      "//content:sandbox_helper_win",
-      "//sandbox",
-    ]
-  }
-
-  configs += [ ":headless_implementation" ]
-}
-
-# Headless library with child specific dependencies (e.g., renderer). This
-# is used when no browser depencendies are needed (e.g. chrome:child_dll).
-static_library("headless_shell_child_lib") {
-  if (is_multi_dll_chrome) {
-    defines = [ "CHROME_MULTIPLE_DLL_CHILD" ]
-  }
-
-  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",
-    "lib/headless_content_main_delegate.cc",
-    "lib/headless_content_main_delegate.h",
-    "public/headless_shell.h",
-  ]
-
-  deps = [
-    ":headless_renderer",
-    "//content/public/child:child",
-    "//net",
-    "//ui/base",
-  ]
-
-  configs += [ ":headless_implementation" ]
-}
-
-# Headless library with all included dependencies. Use this library unless you
-# have browser/child dependencies restrictions.
-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_renderer",
-    "//content/public/app:both",
-    "//content/public/browser",
-    "//content/public/child:child",
-    "//content/public/common",
+    "//headless:headless_lib",
   ]
 
-  if (is_win) {
-    deps += [
-      "//content:sandbox_helper_win",
-      "//sandbox",
-    ]
-  }
+  configs += [ ":headless_implementation" ]
 }
 
 executable("headless_shell") {
   sources = [
     "app/headless_shell_main.cc",
   ]
 
   deps = [
-    ":headless_shell_lib",
+    "//headless:headless_shell_lib",
   ]
+
+  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 = [
-    ":headless_shell_lib",
+    "//headless:headless_shell_lib",
   ]
 }