Reland of Add --headless flag to Windows

headless/public/headless_shell.h

Index: headless/public/headless_shell.h
diff --git a/headless/public/headless_shell.h b/headless/public/headless_shell.h
index 0fd9066a80d5ef01842a9decea1c10e04b67503c..3f1caca2000c7912228e7803f92b74097afc8a0f 100644
--- a/headless/public/headless_shell.h
+++ b/headless/public/headless_shell.h
@@ -5,13 +5,27 @@
 #ifndef HEADLESS_PUBLIC_HEADLESS_SHELL_H_
 #define HEADLESS_PUBLIC_HEADLESS_SHELL_H_
 
-#include "headless/public/headless_export.h"
+#include "content/public/app/content_main.h"
+
+#if defined(OS_WIN)
+#include "sandbox/win/src/sandbox_types.h"
+#endif
 
 namespace headless {
 
+// Start the headless shell applications from a |ContentMainParams| object.
+// Note that the |ContentMainDelegate| is ignored and
+// |HeadlessContentMainDelegate| is used instead.
+int HeadlessShellMain(const content::ContentMainParams& params);
+
 // Start the Headless Shell application. Intended to be called early in main().
 // Returns the exit code for the process.
-HEADLESS_EXPORT int HeadlessShellMain(int argc, const char** argv);
+#if defined(OS_WIN)
+int HeadlessShellMain(HINSTANCE instance,
+                      sandbox::SandboxInterfaceInfo* sandbox_info);
+#else
+int HeadlessShellMain(int argc, const char** argv);
+#endif  // defined(OS_WIN)
 }  // namespace headless
 
 #endif  // HEADLESS_PUBLIC_HEADLESS_SHELL_H_