Revert of Windows install_static refactor.

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 <stdint.h>
@@ skipping 136 matching lines @@
         !InstallUtil::IsPerUserInstall(cmd_line.GetProgram()));
 
     // Intentionally leaked.
     HMODULE watcher_dll = Load(&file);
     if (!watcher_dll)
       return chrome::RESULT_CODE_MISSING_DATA;
 
     ChromeWatcherMainFunction watcher_main =
         reinterpret_cast<ChromeWatcherMainFunction>(
             ::GetProcAddress(watcher_dll, kChromeWatcherDLLEntrypoint));
-    return watcher_main(chrome::GetBrowserExitCodesRegistryPath().c_str(),
-                        parent_process.Take(), main_thread_id,
-                        on_initialized_event.Take(),
-                        watcher_data_directory.value().c_str());
+    return watcher_main(
+        chrome::GetBrowserExitCodesRegistryPath().c_str(),
+        parent_process.Take(), main_thread_id, on_initialized_event.Take(),
+        watcher_data_directory.value().c_str(), channel_name.c_str());
   }
 
   // Initialize the sandbox services.
   sandbox::SandboxInterfaceInfo sandbox_info = {0};
   content::InitializeSandboxInfo(&sandbox_info);
 
   dll_ = Load(&file);
   if (!dll_)
     return chrome::RESULT_CODE_MISSING_DATA;
 
@@ skipping 83 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }