Index: chrome/app/chrome_main.cc |
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc |
index 3ac247fddd943ac2f9ed5d91e4456f572a6bf240..2cc37702d9cd2f141e9a5a37cc81dc078c288f66 100644 |
--- a/chrome/app/chrome_main.cc |
+++ b/chrome/app/chrome_main.cc |
@@ -89,20 +89,22 @@ |
#else |
params.argc = argc; |
params.argv = argv; |
+#endif |
+ |
+#if !defined(OS_WIN) |
base::CommandLine::Init(params.argc, params.argv); |
-#endif // defined(OS_WIN) |
- base::CommandLine::Init(0, nullptr); |
const base::CommandLine* command_line(base::CommandLine::ForCurrentProcess()); |
ALLOW_UNUSED_LOCAL(command_line); |
+#endif |
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) |
+#if defined(OS_LINUX) || defined(OS_MACOSX) |
if (command_line->HasSwitch(switches::kHeadless)) { |
#if defined(OS_MACOSX) |
SetUpBundleOverrides(); |
#endif |
- return headless::HeadlessShellMain(params); |
+ return headless::HeadlessShellMain(argc, argv); |
} |
-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) |
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) |
#if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) |
version_info::Channel channel = chrome::GetChannel(); |