Browser watcher, part deux.

components/browser_watcher/watcher_client_win.cc

+// Copyright (c) 2014 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 "components/browser_watcher/watcher_client_win.h"
+
+#include <windows.h>
+
+#include "base/logging.h"
+#include "base/process/launch.h"
+#include "base/strings/stringprintf.h"
+#include "base/win/windows_version.h"
+#include "components/browser_watcher/exit_code_watcher_win.h"
+
+namespace browser_watcher {
+
+namespace {
+
+base::win::ScopedHandle OpenOwnProcessInheritable() {
+  return base::win::ScopedHandle(
+      ::OpenProcess(SYNCHRONIZE | PROCESS_QUERY_INFORMATION,
+                    TRUE,  // Ineritable handle.
+                    base::GetCurrentProcId()));
+}
+
+void AddHandleArgument(base::ProcessHandle handle,
+                       base::CommandLine* cmd_line) {
+  cmd_line->AppendSwitchASCII(ExitCodeWatcher::kParenthHandleSwitch,
+                              base::StringPrintf("%d", handle));
+}
+
+}  // namespace
+
+WatcherClient::WatcherClient(const base::CommandLine& base_command_line) :
+    use_legacy_launch_(base::win::GetVersion() < base::win::VERSION_VISTA),
+    base_command_line_(base_command_line),
+    process_(base::kNullProcessHandle) {
+}
+
+base::win::ScopedHandle WatcherClient::LaunchWatcherProcess(
+    const base::CommandLine& cmd_line, base::ProcessHandle handle) {
+  base::HandlesToInheritVector to_inherit;
+  base::LaunchOptions options;
+  options.start_hidden = true;
+  if (use_legacy_launch_) {
+    // Launch the child process inheriting all handles on XP.
+    options.inherit_handles = true;
+  } else {
+    // Launch the child process inheriting only |handle| on
+    // Vista and better.
+    to_inherit.push_back(handle);
+    options.handles_to_inherit = &to_inherit;
+  }
+
+  base::ProcessHandle process = base::kNullProcessHandle;
+  if (!base::LaunchProcess(cmd_line, options, &process)) {

[erikwright (departed), 2014/11/18 21:25:32]

nit: braces unnecessary for single-line block

[Sigurður Ásgeirsson, 2014/11/18 21:33:20]

Done.

+    LOG(ERROR) << "Failed to launch browser watcher.";
+  }
+
+  return base::win::ScopedHandle(process);
+}
+
+void WatcherClient::LaunchWatcher() {
+  DCHECK(!process_.IsValid());
+
+  // Build the command line for the watcher process.
+  base::win::ScopedHandle self(OpenOwnProcessInheritable());
+  DCHECK(self.IsValid());
+  base::CommandLine cmd_line(base_command_line_);
+  AddHandleArgument(self.Get(), &cmd_line);
+
+  // Launch it.
+  process_ = LaunchWatcherProcess(cmd_line, self.Get());
+}
+
+}  // namespace browser_watcher