Added crashpad support for Windows

headless/app/headless_shell.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 #include <sstream>
 #include <string>
 #include <utility>
 
 #include "base/base64.h"
@@ skipping 12 matching lines @@
 #include "headless/app/headless_shell_switches.h"
 #include "headless/public/headless_devtools_target.h"
 #include "headless/public/util/deterministic_http_protocol_handler.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_address.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_util.h"
 #include "ui/gfx/geometry/size.h"
 
 #if defined(OS_WIN)
+#include "components/crash/content/app/crash_switches.h"
+#include "components/crash/content/app/run_as_crashpad_handler_win.h"
 #include "sandbox/win/src/sandbox_types.h"
 #endif
 
 namespace headless {
 namespace {
 // Address where to listen to incoming DevTools connections.
 const char kDevToolsHttpServerAddress[] = "127.0.0.1";
 // Default file name for screenshot. Can be overriden by "--screenshot" switch.
 const char kDefaultScreenshotFileName[] = "screenshot.png";
 // Default file name for pdf. Can be overriden by "--print-to-pdf" switch.
@@ skipping 455 matching lines @@
     LOG(ERROR) << "Virtual time budget is disabled "
                << "when remote debugging is enabled.";
     return false;
   }
   return true;
 }
 
 #if defined(OS_WIN)
 int HeadlessShellMain(HINSTANCE instance,
                       sandbox::SandboxInterfaceInfo* sandbox_info) {
+  base::CommandLine::Init(0, nullptr);
+  std::string process_type =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          ::switches::kProcessType);
+  if (process_type == crash_reporter::switches::kCrashpadHandler) {
+    return crash_reporter::RunAsCrashpadHandler(
+        *base::CommandLine::ForCurrentProcess(), ::switches::kProcessType);
+  }
+
   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) {
   RunChildProcessIfNeeded(argc, argv);

[Eric Seckler, 2017/04/24 09:06:14]

I'd have expected a call to base::CommandLine::Init here, too. Codesearch
actually also shows one. Maybe this just needs syncing? *confused* :P

[Sami, 2017/04/24 19:04:28]

That's probably due to this patch:

https://codereview.chromium.org/2836823002/

Maybe we could unify this so that the command line is always initialized on all
platforms?

   HeadlessBrowser::Options::Builder builder(argc, argv);
 #endif  // defined(OS_WIN)
   HeadlessShell shell;
 
   // Enable devtools if requested.
   const base::CommandLine& command_line(
       *base::CommandLine::ForCurrentProcess());
   if (!ValidateCommandLine(command_line))
     return EXIT_FAILURE;
 
@@ skipping 87 matching lines @@
 
 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