win: Remove GetModuleFromAddress, deduplicate __ImageBase code.

remoting/base/breakpad_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.
 
 // This module contains the necessary code to register the Breakpad exception
 // handler. This implementation is based on Chrome crash reporting code. See:
 //   - src/components/crash/content/app/breakpad_win.cc
 //   - src/chrome/installer/setup/setup_main.cc
 
 #include "remoting/base/breakpad.h"
 
 #include <windows.h>
 #include <string>
 
 #include "base/atomicops.h"
 #include "base/file_version_info.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/process/memory.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/win/current_module.h"
 #include "base/win/wrapped_window_proc.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
 
 namespace remoting {
 void InitializeCrashReportingForTest(const wchar_t* pipe_name);
 }  // namespace remoting
 
 namespace {
 
 const wchar_t kBreakpadProductName[] = L"Chromoting";
@@ skipping 104 matching lines @@
   NOTREACHED();
 }
 
 // static
 BreakpadWin* BreakpadWin::GetInstance() {
   return &g_instance.Get();
 }
 
 // Returns the Custom information to be used for crash reporting.
 google_breakpad::CustomClientInfo* BreakpadWin::GetCustomInfo() {
-  HMODULE binary = base::GetModuleFromAddress(
-      reinterpret_cast<void*>(&remoting::InitializeCrashReporting));
   scoped_ptr<FileVersionInfo> version_info(
-      FileVersionInfo::CreateFileVersionInfoForModule(binary));
+      FileVersionInfo::CreateFileVersionInfoForModule(CURRENT_MODULE()));
 
   static wchar_t version[64];
   if (version_info.get()) {
     wcscpy_s(version, version_info->product_version().c_str());
   } else {
     wcscpy_s(version, kBreakpadVersionDefault);
   }
 
   static google_breakpad::CustomInfoEntry ver_entry(
       kBreakpadVersionEntry, version);
@@ skipping 40 matching lines @@
   // Touch the object to make sure it is initialized.
   BreakpadWin::GetInstance();
 }
 
 void InitializeCrashReportingForTest(const wchar_t* pipe_name) {
   BreakpadWin::pipe_name_ = pipe_name;
   InitializeCrashReporting();
 }
 
 }  // namespace remoting