win: Remove GetModuleFromAddress, deduplicate __ImageBase code.

base/debug/profiler.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 "base/debug/profiler.h"
 
 #include <string>
 
 #include "base/debug/debugging_flags.h"
 #include "base/process/process_handle.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
+#include "base/win/current_module.h"
 #include "base/win/pe_image.h"
 #endif  // defined(OS_WIN)
 
 // TODO(peria): Enable profiling on Windows.
 #if BUILDFLAG(ENABLE_PROFILING) && !defined(NO_TCMALLOC) && !defined(OS_WIN)
 #include "third_party/tcmalloc/chromium/src/gperftools/profiler.h"
 #endif
 
 namespace base {
 namespace debug {
@@ skipping 75 matching lines @@
 AddDynamicSymbol GetProfilerAddDynamicSymbolFunc() {
   return NULL;
 }
 
 MoveDynamicSymbol GetProfilerMoveDynamicSymbolFunc() {
   return NULL;
 }
 
 #else  // defined(OS_WIN)
 
-// http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx
-extern "C" IMAGE_DOS_HEADER __ImageBase;
-
 bool IsBinaryInstrumented() {
   enum InstrumentationCheckState {
     UNINITIALIZED,
     INSTRUMENTED_IMAGE,
     NON_INSTRUMENTED_IMAGE,
   };
 
   static InstrumentationCheckState state = UNINITIALIZED;
 
   if (state == UNINITIALIZED) {
-    HMODULE this_module = reinterpret_cast<HMODULE>(&__ImageBase);
-    base::win::PEImage image(this_module);
+    base::win::PEImage image(CURRENT_MODULE());
 
     // Check to be sure our image is structured as we'd expect.
     DCHECK(image.VerifyMagic());
 
     // Syzygy-instrumented binaries contain a PE image section named ".thunks",
     // and all Syzygy-modified binaries contain the ".syzygy" image section.
     // This is a very fast check, as it only looks at the image header.
     if ((image.GetImageSectionHeaderByName(".thunks") != NULL) &&
         (image.GetImageSectionHeaderByName(".syzygy") != NULL)) {
       state = INSTRUMENTED_IMAGE;
@@ skipping 49 matching lines @@
 
   // Keep going.
   return true;
 }
 
 template <typename FunctionType>
 FunctionType FindFunctionInImports(const char* function_name) {
   if (!IsBinaryInstrumented())
     return NULL;
 
-  HMODULE this_module = reinterpret_cast<HMODULE>(&__ImageBase);
-  base::win::PEImage image(this_module);
+  base::win::PEImage image(CURRENT_MODULE());
 
   FunctionSearchContext ctx = { function_name, NULL };
   image.EnumImportChunks(FindResolutionFunctionInImports, &ctx);
 
   return reinterpret_cast<FunctionType>(ctx.function);
 }
 
 }  // namespace
 
 ReturnAddressLocationResolver GetProfilerReturnAddrResolutionFunc() {
@@ skipping 13 matching lines @@
 
 MoveDynamicSymbol GetProfilerMoveDynamicSymbolFunc() {
   return FindFunctionInImports<MoveDynamicSymbol>(
       "MoveDynamicSymbol");
 }
 
 #endif  // defined(OS_WIN)
 
 }  // namespace debug
 }  // namespace base