Introduce the ability to wait for the watcher process to initialize.

chrome/app/client_util.cc

 // Copyright (c) 2012 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 <windows.h>
 #include <shlwapi.h>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
 #include "base/environment.h"
 #include "base/file_version_info.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/version.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
 #include "chrome/app/chrome_crash_reporter_client.h"
+#include "chrome/app/chrome_watcher_client_win.h"
 #include "chrome/app/chrome_watcher_command_line_win.h"
 #include "chrome/app/client_util.h"
 #include "chrome/app/image_pre_reader_win.h"
 #include "chrome/chrome_watcher/chrome_watcher_main_api.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/util_constants.h"
-#include "components/browser_watcher/watcher_client_win.h"
 #include "components/crash/app/breakpad_win.h"
 #include "components/crash/app/crash_reporter_client.h"
 #include "components/metrics/client_info.h"
 #include "content/public/app/startup_helper_win.h"
 #include "sandbox/win/src/sandbox.h"
 
 namespace {
 // The entry point signature of chrome.dll.
 typedef int (*DLL_MAIN)(HINSTANCE, sandbox::SandboxInterfaceInfo*);
 
@@ skipping 125 matching lines @@
     HMODULE metro_dll = Load(&version, &file);
     if (!metro_dll)
       return chrome::RESULT_CODE_MISSING_DATA;
 
     InitMetro chrome_metro_main =
         reinterpret_cast<InitMetro>(::GetProcAddress(metro_dll, "InitMetro"));
     return chrome_metro_main();
   }
 
   if (process_type_ == "watcher") {
-    base::win::ScopedHandle parent_process =
-        InterpretChromeWatcherCommandLine(cmd_line);
-    if (!parent_process.IsValid())
+    base::win::ScopedHandle parent_process;
+    base::win::ScopedHandle on_initialized_event;
+    if (!InterpretChromeWatcherCommandLine(cmd_line, &parent_process,
+                                           &on_initialized_event)) {
       return chrome::RESULT_CODE_UNSUPPORTED_PARAM;
+    }
 
     // Intentionally leaked.
     HMODULE watcher_dll = Load(&version, &file);
     if (!watcher_dll)
       return chrome::RESULT_CODE_MISSING_DATA;
 
     ChromeWatcherMainFunction watcher_main =
         reinterpret_cast<ChromeWatcherMainFunction>(
             ::GetProcAddress(watcher_dll, kChromeWatcherDLLEntrypoint));
     return watcher_main(chrome::kBrowserExitCodesRegistryPath,
-                        parent_process.Take());
+                        parent_process.Take(), on_initialized_event.Take());
   }
 
   // Initialize the sandbox services.
   sandbox::SandboxInterfaceInfo sandbox_info = {0};
   content::InitializeSandboxInfo(&sandbox_info);
 
   crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
   bool exit_now = true;
   if (process_type_.empty()) {
     if (breakpad::ShowRestartDialogIfCrashed(&exit_now)) {
@@ skipping 46 matching lines @@
 
 void ChromeDllLoader::OnBeforeLaunch(const std::string& process_type,
                                      const base::FilePath& dll_path) {
   if (process_type.empty()) {
     RecordDidRun(dll_path);
 
     // Launch the watcher process if stats collection consent has been granted.
     if (g_chrome_crash_client.Get().GetCollectStatsConsent()) {
       base::char16 exe_path[MAX_PATH];
       ::GetModuleFileNameW(nullptr, exe_path, arraysize(exe_path));
-
-      browser_watcher::WatcherClient watcher_client(base::Bind(
+      ChromeWatcherClient watcher_client(base::Bind(
           &GenerateChromeWatcherCommandLine, base::FilePath(exe_path)));
       watcher_client.LaunchWatcher();
     }
   }
 }
 
 int ChromeDllLoader::OnBeforeExit(int return_code,
                                   const base::FilePath& dll_path) {
   // NORMAL_EXIT_CANCEL is used for experiments when the user cancels
   // so we need to reset the did_run signal so omaha does not count
@@ skipping 15 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }