Reland of Add --headless flag to Windows

headless/public/headless_browser.cc

Index: headless/public/headless_browser.cc
diff --git a/headless/public/headless_browser.cc b/headless/public/headless_browser.cc
index 64e31a85deb612ded4d8c3f338cd21a162852b5f..58067c7d570b176e4b48dde746ec04eb522607a8 100644
--- a/headless/public/headless_browser.cc
+++ b/headless/public/headless_browser.cc
@@ -8,6 +8,10 @@
 
 #include "content/public/common/user_agent.h"
 #include "headless/public/version.h"
+
+#if defined(OS_WIN)
+#include "sandbox/win/src/sandbox_types.h"
+#endif
 
 using Options = headless::HeadlessBrowser::Options;
 using Builder = headless::HeadlessBrowser::Options::Builder;
@@ -27,6 +31,10 @@
 Options::Options(int argc, const char** argv)
     : argc(argc),
       argv(argv),
+#if defined(OS_WIN)
+      instance(0),
+      sandbox_info(nullptr),
+#endif
       message_pump(nullptr),
       single_process_mode(false),
       disable_sandbox(false),
@@ -105,6 +113,18 @@
   return *this;
 }
 
+#if defined(OS_WIN)
+Builder& Builder::SetInstance(HINSTANCE instance) {
+  options_.instance = instance;
+  return *this;
+}
+
+Builder& Builder::SetSandboxInfo(sandbox::SandboxInterfaceInfo* sandbox_info) {
+  options_.sandbox_info = sandbox_info;
+  return *this;
+}
+#endif  // defined(OS_WIN)
+
 Builder& Builder::SetUserDataDir(const base::FilePath& user_data_dir) {
   options_.user_data_dir = user_data_dir;
   return *this;