Stability instrumentation Crashpad integration

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 531 matching lines @@
 #if defined(OS_WIN)
 int HeadlessShellMain(HINSTANCE instance,
                       sandbox::SandboxInterfaceInfo* sandbox_info) {
   base::CommandLine::Init(0, nullptr);
 #if defined(HEADLESS_USE_CRASPHAD)
   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);
+        *base::CommandLine::ForCurrentProcess(), base::FilePath(),
+        ::switches::kProcessType, switches::kUserDataDir);

[grt (UTC plus 2), 2017/05/24 06:58:49]

uber-nit: "::switches::kUserDataDir" for consistency with kProcessType

[manzagop (departed), 2017/05/24 13:19:53]

Actually, that second one is in the headless namespace
(headless::switches::kUserDataDir from headless/app/headless_shell_switches.h).
Should I fully qualify it to make it clearer?

[grt (UTC plus 2), 2017/05/24 13:35:02]

Ha. Hrm. I'd be inclined to remove :: from the first, but I'm okay with it
as-is.

[alex clarke (OOO till 29th), 2017/05/24 13:45:06]

I don't know why this code is using ::
If it compiles without I'd prefer that, but its not a big deal :)

[manzagop (departed), 2017/05/24 15:40:29]

Hm, I think the author's intent was to highlight this is coming from
content/public/common/content_switches.h, and not headless::switches. Based on
that, is your preference still the same? I'm happy to go with  either.

[alex clarke (OOO till 29th), 2017/05/24 16:30:48]

Ah yes you're probably right.  Lets leave it as is then.

   }
 #endif  // defined(HEADLESS_USE_CRASPHAD)
   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);
@@ skipping 111 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