Expose a function to get the path to a DLL.

chrome/app/client_util.h

Index: chrome/app/client_util.h
diff --git a/chrome/app/client_util.h b/chrome/app/client_util.h
index de09a667af9d669ef14096856c4d96b9f2d2d548..1009856222301e4bb354b77077724ce003d05362 100644
--- a/chrome/app/client_util.h
+++ b/chrome/app/client_util.h
@@ -2,71 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This file defines utility functions that can report details about the
-// host operating environment.
+// This file defines a utility function to get the full path of a module.
 
 #ifndef CHROME_APP_CLIENT_UTIL_H_
 #define CHROME_APP_CLIENT_UTIL_H_
 
-#include <windows.h>
-
-#include <string>
+#include "base/files/file_path.h"
 #include "base/strings/string16.h"
 
-namespace sandbox {
-  struct SandboxInterfaceInfo;
-}
-
-// Returns the version in the current module's version resource or the empty
-// string if none found.
-base::string16 GetCurrentModuleVersion();
-
-// Implements the common aspects of loading the main dll for both chrome and
-// chromium scenarios, which are in charge of implementing two abstract
-// methods: GetRegistryPath() and OnBeforeLaunch().
-class MainDllLoader {
- public:
-  MainDllLoader();
-  virtual ~MainDllLoader();
-
-  // Loads and calls the entry point of chrome.dll. |instance| is the exe
-  // instance retrieved from wWinMain.
-  // The return value is what the main entry point of chrome.dll returns
-  // upon termination.
-  int Launch(HINSTANCE instance);
-
-  // Launches a new instance of the browser if the current instance in
-  // persistent mode an upgrade is detected.
-  void RelaunchChromeBrowserWithNewCommandLineIfNeeded();
-
- protected:
-  // Called after chrome.dll has been loaded but before the entry point
-  // is invoked. Derived classes can implement custom actions here.
-  // |process_type| is the argument to the --type command line argument, e.g.
-  // "renderer", "watcher", etc.
-  // |dll_path| refers to the path of the Chrome dll being loaded.
-  virtual void OnBeforeLaunch(const std::string& process_type,
-                              const base::FilePath& dll_path) = 0;
-
-  // Called after the chrome.dll entry point returns and before terminating
-  // this process. The return value will be used as the process return code.
-  // |dll_path| refers to the path of the Chrome dll being loaded.
-  virtual int OnBeforeExit(int return_code, const base::FilePath& dll_path) = 0;
-
- private:
-  // Loads chrome.dll, populating |version| with the version of the DLL loaded
-  // and |module| with the path of the loaded DLL. Returns a reference to the
-  // module, or null on failure.
-  HMODULE Load(base::string16* version, base::FilePath* module);
-
- private:
-  HMODULE dll_;
-  std::string process_type_;
-  const bool metro_mode_;
-};
-
-// Factory for the MainDllLoader. Caller owns the pointer and should call
-// delete to free it.
-MainDllLoader* MakeMainDllLoader();
+// Returns the full path to a module named |module_name|, or an empty path if
+// the module is not found. On output, |version| is populated with the version
+// of the module.
+base::FilePath GetModulePath(const base::char16* module_name,
+                             base::string16* version);
 
 #endif  // CHROME_APP_CLIENT_UTIL_H_