Link headless_renderer for chrome.dll when is_multi_dll_chrome=false

A recent change made to enable is_multi_dll_chrome = false caused a
regression for component builds where the crash export thunks were
getting linked into chrome.dll instead of chrome_elf. Chrome.dll pulls
in headless_shell_lib which on Windows depends on crash_export_thunks.
This has the side-effect of statically linking these thunks into
chrome.dll instead of having them be imported from chrome_elf.dll. The
result of which is that the crash report database in chrome_elf.dll is
never initialized. The bug only impacts component builds where
is_multi_dll_chrome is set to false.

Regression caused by: http://crrev.com/c/1697368

Bug: 991886
Change-Id: I1170544da9842fc503cc48ffd2cc07f5023a4240
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1742400Reviewed-by: Sami Kyöstilä <skyostil@chromium.org>
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Commit-Queue: Chris Davis <chrdavis@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#686322}

chrome/BUILD.gn

@@ -405,6 +405,7 @@ if (is_win) {
       "//content/app/resources",
       "//content/public/common:service_names",
       "//crypto",
+      "//headless:headless_shell_browser_lib",
       "//net:net_resources",
       "//ppapi/buildflags",
       "//services/service_manager/embedder",
@@ -432,10 +433,7 @@ if (is_win) {
 
     if (is_multi_dll_chrome) {
       defines += [ "CHROME_MULTIPLE_DLL_BROWSER" ]
-      deps += [
-        "//content/public/app:browser",
-        "//headless:headless_shell_browser_lib",
-      ]
+      deps += [ "//content/public/app:browser" ]
       assert_no_deps = [
         # The browser DLL may not depend on blink or v8.
         "//third_party/blink/public:blink",
@@ -449,7 +447,7 @@ if (is_win) {
       deps += [
         ":child_dependencies",
         "//content/public/app:both",
-        "//headless:headless_shell_lib",
+        "//headless:headless_renderer",
       ]
     }
 

headless/BUILD.gn

@@ -540,6 +540,8 @@ if (!is_component_build) {
       "lib/headless_content_main_delegate_mac.mm",
       "lib/renderer/headless_content_renderer_client.cc",
       "lib/renderer/headless_content_renderer_client.h",
+      "lib/utility/headless_content_utility_client.cc",
+      "lib/utility/headless_content_utility_client.h",
     ]
 
     if (headless_use_embedded_resources) {