win: Remove GetModuleFromAddress, deduplicate __ImageBase code.

chrome/installer/util/module_util_win.cc

Index: chrome/installer/util/module_util_win.cc
diff --git a/chrome/installer/util/module_util_win.cc b/chrome/installer/util/module_util_win.cc
index 12366fa82a88d3206247f3d1e2c544cc3fe34868..3a8df1936728237aa80e6c79cf0e9d3a04239ad4 100644
--- a/chrome/installer/util/module_util_win.cc
+++ b/chrome/installer/util/module_util_win.cc
@@ -13,6 +13,7 @@
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/version.h"
+#include "base/win/current_module.h"
 
 namespace installer {
 
@@ -21,7 +22,7 @@ namespace {
 // Returns the version in the current executable's version resource.
 base::string16 GetCurrentExecutableVersion() {
   scoped_ptr<FileVersionInfo> file_version_info(
-      CREATE_FILE_VERSION_INFO_FOR_CURRENT_MODULE());
+      FileVersionInfo::CreateFileVersionInfoForModule(CURRENT_MODULE()));
   DCHECK(file_version_info.get());
   base::string16 version_string(file_version_info->file_version());
   DCHECK(base::Version(base::UTF16ToASCII(version_string)).IsValid());