Expose a function to get the path to a DLL.

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 <windows.h>
-#include <shlwapi.h>
+#include <windows.h>  // NOLINT
+#include <shlwapi.h>  // NOLINT
+
+#include "chrome/app/main_dll_loader_win.h"
 
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.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/path_service.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/trace_event/trace_event.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/app/kasko_client.h"
 #include "chrome/chrome_watcher/chrome_watcher_main_api.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.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/module_util_win.h"
 #include "chrome/installer/util/util_constants.h"
 #include "components/crash/content/app/breakpad_win.h"
 #include "components/crash/content/app/crash_reporter_client.h"
 #include "content/public/app/sandbox_helper_win.h"
 #include "content/public/common/content_switches.h"
 #include "sandbox/win/src/sandbox.h"
 
 namespace {
 // The entry point signature of chrome.dll.
 typedef int (*DLL_MAIN)(HINSTANCE, sandbox::SandboxInterfaceInfo*);
@@ skipping 31 matching lines @@
   GoogleUpdateSettings::UpdateDidRunState(false, system_level);
 }
 
 bool InMetroMode() {
   return (wcsstr(
       ::GetCommandLineW(), L" -ServerName:DefaultBrowserServer") != nullptr);
 }
 
 typedef int (*InitMetro)();
 
-// Returns the directory in which the currently running executable resides.
-base::FilePath GetExecutableDir() {
-  base::char16 path[MAX_PATH];
-  ::GetModuleFileNameW(nullptr, path, MAX_PATH);
-  return base::FilePath(path).DirName();
-}
-
 }  // namespace
 
-base::string16 GetCurrentModuleVersion() {
-  scoped_ptr<FileVersionInfo> file_version_info(
-      CREATE_FILE_VERSION_INFO_FOR_CURRENT_MODULE());
-  if (file_version_info.get()) {
-    base::string16 version_string(file_version_info->file_version());
-    if (Version(base::UTF16ToASCII(version_string)).IsValid())
-      return version_string;
-  }
-  return base::string16();
-}
-
 //=============================================================================
 
 MainDllLoader::MainDllLoader()
-  : dll_(nullptr), metro_mode_(InMetroMode()) {
+    : dll_(nullptr), metro_mode_(InMetroMode()) {
 }
 
 MainDllLoader::~MainDllLoader() {
 }
 
 // Loading chrome is an interesting affair. First we try loading from the
 // current directory to support run-what-you-compile and other development
 // scenarios.
 // If that fails then we look at the version resource in the current
 // module. This is the expected path for chrome.exe browser instances in an
 // installed build.
 HMODULE MainDllLoader::Load(base::string16* version, base::FilePath* module) {
   const base::char16* dll_name = nullptr;
   if (metro_mode_) {
     dll_name = installer::kChromeMetroDll;
   } else if (process_type_ == "service" || process_type_.empty()) {
     dll_name = installer::kChromeDll;
   } else if (process_type_ == "watcher") {
     dll_name = kChromeWatcherDll;
   } else {
 #if defined(CHROME_MULTIPLE_DLL)
     dll_name = installer::kChromeChildDll;
 #else
     dll_name = installer::kChromeDll;
 #endif
   }
 
+  *module = installer::GetModulePath(dll_name, version);
+  if (module->empty()) {
+    PLOG(ERROR) << "Cannot find module " << dll_name;
+    return nullptr;
+  }
   const bool pre_read = !metro_mode_;
-  base::FilePath module_dir = GetExecutableDir();
-  *module = module_dir.Append(dll_name);
   HMODULE dll = LoadModuleWithDirectory(*module, pre_read);
   if (!dll) {
-    base::string16 version_string(GetCurrentModuleVersion());
-    if (version_string.empty()) {
-      LOG(ERROR) << "No valid Chrome version found";
-      return nullptr;
-    }
-    *version = version_string;
-    *module = module_dir.Append(version_string).Append(dll_name);
-    dll = LoadModuleWithDirectory(*module, pre_read);
-    if (!dll) {
-      PLOG(ERROR) << "Failed to load Chrome DLL from " << module->value();
-      return nullptr;
-    }
+    PLOG(ERROR) << "Failed to load Chrome DLL from " << module->value();
+    return nullptr;
   }
 
   DCHECK(dll);
   return dll;
 }
 
 // Launching is a matter of loading the right dll, setting the CHROME_VERSION
 // environment variable and just calling the entry point. Derived classes can
 // add custom code in the OnBeforeLaunch callback.
 int MainDllLoader::Launch(HINSTANCE instance) {
@@ skipping 197 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }