Windows install_static refactor.

chrome/chrome_watcher/chrome_watcher_main.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 <windows.h>
 #include <sddl.h>
 
 #include <utility>
 
 #include "base/at_exit.h"
@@ skipping 15 matching lines @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/win_util.h"
-
 #include "chrome/chrome_watcher/chrome_watcher_main_api.h"
-#include "chrome/installer/util/util_constants.h"
+#include "chrome/common/chrome_constants.h"
+#include "chrome/install_static/install_details.h"
 #include "components/browser_watcher/endsession_watcher_window_win.h"
 #include "components/browser_watcher/exit_code_watcher_win.h"
 #include "components/browser_watcher/window_hang_monitor_win.h"
 
 namespace {
 
 // Use the same log facility as Chrome for convenience.
 // {7FE69228-633E-4f06-80C1-527FEA23E3A7}
 const GUID kChromeWatcherTraceProviderName = {
     0x7fe69228, 0x633e, 0x4f06,
@@ skipping 131 matching lines @@
 }
 
 }  // namespace
 
 // The main entry point to the watcher, declared as extern "C" to avoid name
 // mangling.
 extern "C" int WatcherMain(const base::char16* registry_path,
                            HANDLE process_handle,
                            DWORD main_thread_id,
                            HANDLE on_initialized_event_handle,
-                           const base::char16* browser_data_directory,
-                           const base::char16* channel_name) {
+                           const base::char16* browser_data_directory) {
+  install_static::InstallDetails::InitializeFromPrimaryModule(
+      chrome::kChromeElfDllName);

[Sigurður Ásgeirsson, 2016/10/28 15:44:16]

ah - nice!

   base::Process process(process_handle);
   base::win::ScopedHandle on_initialized_event(on_initialized_event_handle);
 
   // The exit manager is in charge of calling the dtors of singletons.
   base::AtExitManager exit_manager;
   // Initialize the commandline singleton from the environment.
   base::CommandLine::Init(0, nullptr);
 
   logging::LogEventProvider::Initialize(kChromeWatcherTraceProviderName);
 
@@ skipping 16 matching lines @@
 
   // Wind logging down.
   logging::LogEventProvider::Uninitialize();
 
   return 0;
 }
 
 static_assert(
     std::is_same<decltype(&WatcherMain), ChromeWatcherMainFunction>::value,
     "WatcherMain() has wrong type");