Index: base/message_loop/message_pump_win.cc |
diff --git a/base/message_loop/message_pump_win.cc b/base/message_loop/message_pump_win.cc |
index 803bb5d4f82e1602cd821f898b36bf734dc8228e..0d2fefc1fae6fbb35db2af824cb4f8a42ee2679c 100644 |
--- a/base/message_loop/message_pump_win.cc |
+++ b/base/message_loop/message_pump_win.cc |
@@ -11,9 +11,9 @@ |
#include "base/message_loop/message_loop.h" |
#include "base/metrics/histogram.h" |
-#include "base/process/memory.h" |
#include "base/strings/stringprintf.h" |
#include "base/trace_event/trace_event.h" |
+#include "base/win/current_module.h" |
#include "base/win/wrapped_window_proc.h" |
namespace base { |
@@ -89,8 +89,7 @@ MessagePumpForUI::MessagePumpForUI() |
MessagePumpForUI::~MessagePumpForUI() { |
DestroyWindow(message_hwnd_); |
- UnregisterClass(MAKEINTATOM(atom_), |
- GetModuleFromAddress(&WndProcThunk)); |
+ UnregisterClass(MAKEINTATOM(atom_), CURRENT_MODULE()); |
} |
void MessagePumpForUI::ScheduleWork() { |
@@ -198,7 +197,7 @@ void MessagePumpForUI::InitMessageWnd() { |
// Generate a unique window class name. |
string16 class_name = StringPrintf(kWndClassFormat, this); |
- HINSTANCE instance = GetModuleFromAddress(&WndProcThunk); |
+ HINSTANCE instance = CURRENT_MODULE(); |
WNDCLASSEX wc = {0}; |
wc.cbSize = sizeof(wc); |
wc.lpfnWndProc = base::win::WrappedWindowProc<WndProcThunk>; |