Add --headless flag to Windows

headless/app/headless_shell.cc

Index: headless/app/headless_shell.cc
diff --git a/headless/app/headless_shell.cc b/headless/app/headless_shell.cc
index a38c6050b42780bc3ece37ce72e1497e6851c44d..14cf68c52cf045bac29373d594b06f7f2947f584 100644
--- a/headless/app/headless_shell.cc
+++ b/headless/app/headless_shell.cc
@@ -18,6 +18,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
+#include "content/public/app/content_main.h"
 #include "content/public/common/content_switches.h"
 #include "headless/app/headless_shell.h"
 #include "headless/app/headless_shell_switches.h"
@@ -30,6 +31,10 @@
 #include "net/http/http_util.h"
 #include "ui/gfx/geometry/size.h"
 
+#if defined(OS_WIN)
+#include "sandbox/win/src/sandbox_types.h"
+#endif
+
 namespace headless {
 namespace {
 // Address where to listen to incoming DevTools connections.
@@ -62,14 +67,15 @@ HeadlessShell::HeadlessShell()
 HeadlessShell::~HeadlessShell() {}
 
 void HeadlessShell::OnStart(HeadlessBrowser* browser) {
+#if !defined(CHROME_MULTIPLE_DLL_CHILD)

[alex clarke (OOO till 29th), 2017/05/12 11:31:28]

It's kind of a shame about all the #ifs although that might just be the way of
things.

Anyway I have't really thought this through but I wonder if it's worth making
this virtual and adding a headless_shell_win.cc (GN supports platform specific
compilation based on file suffix) which overrides it with an empty
implementation?  Can do something similar for Shutdown and DevToolsTargetReady. 
WDYT?

[dvallet, 2017/05/12 21:12:03]

That's a good idea Alex! 
I'll look into it and will definitely think of making this more streamlined. I
still want to land as is to check that this solves the size regression and will
cleanup afterwards. Also, I want to avoid keep breaking the Windows build.

I added a TODO

   browser_ = browser;
 
   HeadlessBrowserContext::Builder context_builder =
       browser_->CreateBrowserContextBuilder();
   // TODO(eseckler): These switches should also affect BrowserContexts that
   // are created via DevTools later.
-  DeterministicHttpProtocolHandler* http_handler;
-  DeterministicHttpProtocolHandler* https_handler;
+  DeterministicHttpProtocolHandler* http_handler = nullptr;
+  DeterministicHttpProtocolHandler* https_handler = nullptr;
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDeterministicFetch)) {
     deterministic_dispatcher_.reset(
@@ -125,9 +131,11 @@ void HeadlessShell::OnStart(HeadlessBrowser* browser) {
       web_contents_->AddObserver(this);
     }
   }
+#endif  // !defined(CHROME_MULTIPLE_DLL_CHILD)
 }
 
 void HeadlessShell::Shutdown() {
+#if !defined(CHROME_MULTIPLE_DLL_CHILD)
   if (!web_contents_)
     return;
   if (!RemoteDebuggingEnabled()) {
@@ -142,9 +150,11 @@ void HeadlessShell::Shutdown() {
   web_contents_ = nullptr;
   browser_context_->Close();
   browser_->Shutdown();
+#endif  // !defined(CHROME_MULTIPLE_DLL_CHILD)
 }
 
 void HeadlessShell::DevToolsTargetReady() {
+#if !defined(CHROME_MULTIPLE_DLL_CHILD)
   web_contents_->GetDevToolsTarget()->AttachClient(devtools_client_.get());
   devtools_client_->GetInspector()->GetExperimental()->AddObserver(this);
   devtools_client_->GetPage()->GetExperimental()->AddObserver(this);
@@ -216,6 +226,7 @@ void HeadlessShell::DevToolsTargetReady() {
   }
 
   // TODO(skyostil): Implement more features to demonstrate the devtools API.
+#endif  // !defined(CHROME_MULTIPLE_DLL_CHILD)
 }
 
 void HeadlessShell::FetchTimeout() {
@@ -440,10 +451,10 @@ void HeadlessShell::OnFileOpened(const std::string& base64_data,
 }
 
 void HeadlessShell::OnFileWritten(const base::FilePath file_name,
-                                  const int length,
+                                  const size_t length,
                                   base::File::Error error_code,
                                   int write_result) {
-  if (write_result < length) {
+  if (write_result < static_cast<int>(length)) {
     // TODO(eseckler): Support recovering from partial writes.
     LOG(ERROR) << "Writing to file " << file_name.value()
                << " was unsuccessful: "
@@ -527,18 +538,28 @@ bool ValidateCommandLine(const base::CommandLine& command_line) {
   return true;
 }
 
+#if defined(OS_WIN)
+int HeadlessShellMain(HINSTANCE instance,
+                      sandbox::SandboxInterfaceInfo* sandbox_info) {
+  base::CommandLine::Init(0, nullptr);
+  RunChildProcessIfNeeded(instance, sandbox_info);
+  HeadlessBrowser::Options::Builder builder(0, nullptr);
+  builder.SetInstance(instance);
+  builder.SetSandboxInfo(std::move(sandbox_info));
+#else
 int HeadlessShellMain(int argc, const char** argv) {
   base::CommandLine::Init(argc, argv);
   RunChildProcessIfNeeded(argc, argv);
-  HeadlessShell shell;
   HeadlessBrowser::Options::Builder builder(argc, argv);
+#endif  // defined(OS_WIN)
+  HeadlessShell shell;
 
   const base::CommandLine& command_line(
       *base::CommandLine::ForCurrentProcess());
   if (!ValidateCommandLine(command_line))
     return EXIT_FAILURE;
 
-  if (command_line.HasSwitch(::switches::kEnableCrashReporter))
+  if (command_line.HasSwitch(switches::kEnableCrashReporter))
     builder.SetCrashReporterEnabled(true);
   if (command_line.HasSwitch(switches::kCrashDumpsDir)) {
     builder.SetCrashDumpsDir(
@@ -639,4 +660,12 @@ int HeadlessShellMain(int argc, const char** argv) {
       base::Bind(&HeadlessShell::OnStart, base::Unretained(&shell)));
 }
 
+int HeadlessShellMain(const content::ContentMainParams& params) {
+#if defined(OS_WIN)
+  return HeadlessShellMain(params.instance, params.sandbox_info);
+#else
+  return HeadlessShellMain(params.argc, params.argv);
+#endif
+}
+
 }  // namespace headless