Fix WebMain function prototype when built as a Windows console app

Apparently is_asan = true implies win_console_app = true.
Fix for https://crrev.com/689827

TBR=jam@chromium.org

Change-Id: I422b59c25d4c1f99d5328ab1809c0f1733e96c89
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1769223Reviewed-by: Reid Kleckner <rnk@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Reid Kleckner <rnk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690063}

weblayer/BUILD.gn

@@ -75,9 +75,9 @@ jumbo_static_library("weblayer_lib") {
     "//content/app/resources",
     "//content/app/strings",
     "//content/public/app:both",
+    "//content/public/child:child",
     "//content/public/common",
     "//content/public/common:service_names",
-    "//content/public/child:child",
     "//net",
     "//net:net_resources",
     "//sandbox",
@@ -111,6 +111,9 @@ jumbo_static_library("weblayer_lib") {
 
   if (is_win) {
     deps += [ "//content:sandbox_helper_win" ]
+    if (win_console_app) {
+      defines = [ "WIN_CONSOLE_APP" ]
+    }
   }
 
   if (is_linux) {

weblayer/app/web_main.cc

@@ -20,12 +20,14 @@ WebMainParams::WebMainParams() = default;
 WebMainParams::WebMainParams(const WebMainParams& other) = default;
 WebMainParams::~WebMainParams() = default;
 
-int WebMain(WebMainParams params,
+int WebMain(WebMainParams params
 #if defined(OS_WIN)
 #if !defined(WIN_CONSOLE_APP)
+            ,
             HINSTANCE instance
 #endif
 #else
+            ,
             int argc,
             const char** argv
 #endif

weblayer/public/web_main.h

@@ -46,12 +46,14 @@ struct WebMainParams {
   std::string major_version;
 };
 
-int WebMain(WebMainParams params,
+int WebMain(WebMainParams params
 #if defined(OS_WIN)
 #if !defined(WIN_CONSOLE_APP)
+            ,
             HINSTANCE instance
 #endif
 #else
+            ,
             int argc,
             const char** argv
 #endif