Restore the chrome watcher pending relocation

chrome/app/main_dll_loader_win.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 "chrome/app/main_dll_loader_win.h"
 
 #include <windows.h>  // NOLINT
 #include <shlwapi.h>  // NOLINT
 #include <stddef.h>
 #include <userenv.h>  // NOLINT
@@ skipping 185 matching lines @@
   int OnBeforeExit(int return_code, const base::FilePath& dll_path) override;
 
  private:
   std::unique_ptr<ChromeWatcherClient> chrome_watcher_client_;
 };
 
 void ChromeDllLoader::OnBeforeLaunch(const std::string& process_type,
                                      const base::FilePath& dll_path) {
   if (process_type.empty()) {
     RecordDidRun(dll_path);
+
+    // Launch the watcher process.
+    base::FilePath exe_path;
+    if (PathService::Get(base::FILE_EXE, &exe_path)) {
+      chrome_watcher_client_.reset(new ChromeWatcherClient(
+          base::Bind(&GenerateChromeWatcherCommandLine, exe_path)));
+      chrome_watcher_client_->LaunchWatcher();
+    }
   } else {
     // Set non-browser processes up to be killed by the system after the browser
     // goes away. The browser uses the default shutdown order, which is 0x280.
     // Note that lower numbers here denote "kill later" and higher numbers mean
     // "kill sooner".
     // This gets rid of most of those unsighly sad tabs on logout and shutdown.
     ::SetProcessShutdownParameters(0x280 - 1, SHUTDOWN_NORETRY);
   }
 }
 
@@ skipping 22 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }