win: Remove GetModuleFromAddress, deduplicate __ImageBase code.

base/file_version_info.h

Index: base/file_version_info.h
diff --git a/base/file_version_info.h b/base/file_version_info.h
index 8c1bf92438e7b0a849e06cd3eb8de25cb046ccd2..3b9457cceace1cde6363cc06046ee0a641136537 100644
--- a/base/file_version_info.h
+++ b/base/file_version_info.h
@@ -5,19 +5,16 @@
 #ifndef BASE_FILE_VERSION_INFO_H_
 #define BASE_FILE_VERSION_INFO_H_
 
-#include "build/build_config.h"
-
-#if defined(OS_WIN)
-#include <windows.h>
-// http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx
-extern "C" IMAGE_DOS_HEADER __ImageBase;
-#endif  // OS_WIN
-
 #include <string>
 
+#include "build/build_config.h"
 #include "base/base_export.h"
 #include "base/strings/string16.h"
 
+#if defined(OS_WIN)
+#include <windows.h>
+#endif
+
 namespace base {
 class FilePath;
 }
@@ -32,17 +29,6 @@ class FilePath;
 // version returns values from the Info.plist as appropriate. TODO(avi): make
 // this a less-obvious Windows-ism.
 
-#if defined(OS_WIN)
-// Creates a FileVersionInfo for the current module. Returns NULL in case of
-// error. The returned object should be deleted when you are done with it. This
-// is done as a macro to force inlining of __ImageBase. It used to be inside of
-// a method labeled with __forceinline, but inlining through __forceinline
-// stopped working for Debug builds in VS2013 (http://crbug.com/516359).
-#define CREATE_FILE_VERSION_INFO_FOR_CURRENT_MODULE() \
-    FileVersionInfo::CreateFileVersionInfoForModule( \
-        reinterpret_cast<HMODULE>(&__ImageBase))
-#endif
-
 class BASE_EXPORT FileVersionInfo {
  public:
   virtual ~FileVersionInfo() {}
@@ -57,8 +43,6 @@ class BASE_EXPORT FileVersionInfo {
 #if defined(OS_WIN)
   // Creates a FileVersionInfo for the specified module. Returns NULL in case
   // of error. The returned object should be deleted when you are done with it.
-  // See CREATE_FILE_VERSION_INFO_FOR_CURRENT_MODULE() helper above for a
-  // CreateFileVersionInfoForCurrentModule() alternative for Windows.
   static FileVersionInfo* CreateFileVersionInfoForModule(HMODULE module);
 #else
   // Creates a FileVersionInfo for the current module. Returns NULL in case